Merge branch 'master' of https://github.com/Determinant/piztor

Conflicts:
	client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
	client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
	client/Piztor/gen/com/macaroon/piztor/R.java
	client/Piztor/res/values/strings.xml
	client/bin/classes/com/macaroon/piztor/ActStatus.class
	client/bin/classes/com/macaroon/piztor/EmptyStatus.class
	client/bin/classes/com/macaroon/piztor/Setting.class
	client/src/com/macaroon/piztor/AppMgr.java
	client/src/com/macaroon/piztor/Setting.java

19 files changed, 0 insertions, 0 deletions

diff --git a/client/bin/res/drawable/bottom_img.png b/client/bin/res/drawable/bottom_img.png
new file mode 100644
index 0000000..ee34eb0
--- /dev/null
+++ b/client/bin/res/drawable/bottom_img.png
diff --git a/client/bin/res/drawable/footbar_background.png b/client/bin/res/drawable/footbar_background.png
new file mode 100644
index 0000000..d0ad14f
--- /dev/null
+++ b/client/bin/res/drawable/footbar_background.png
diff --git a/client/bin/res/drawable/footbar_checkin.png b/client/bin/res/drawable/footbar_checkin.png
new file mode 100644
index 0000000..9d9ccd0
--- /dev/null
+++ b/client/bin/res/drawable/footbar_checkin.png
diff --git a/client/bin/res/drawable/footbar_checkin_1.png b/client/bin/res/drawable/footbar_checkin_1.png
new file mode 100644
index 0000000..a14f872
--- /dev/null
+++ b/client/bin/res/drawable/footbar_checkin_1.png
diff --git a/client/bin/res/drawable/footbar_fetch.png b/client/bin/res/drawable/footbar_fetch.png
new file mode 100644
index 0000000..a5e9bd3
--- /dev/null
+++ b/client/bin/res/drawable/footbar_fetch.png
diff --git a/client/bin/res/drawable/footbar_fetch_1.png b/client/bin/res/drawable/footbar_fetch_1.png
new file mode 100644
index 0000000..214b712
--- /dev/null
+++ b/client/bin/res/drawable/footbar_fetch_1.png
diff --git a/client/bin/res/drawable/footbar_marker.png b/client/bin/res/drawable/footbar_marker.png
new file mode 100644
index 0000000..e408cf8
--- /dev/null
+++ b/client/bin/res/drawable/footbar_marker.png
diff --git a/client/bin/res/drawable/footbar_marker_1.png b/client/bin/res/drawable/footbar_marker_1.png
new file mode 100644
index 0000000..1262bda
--- /dev/null
+++ b/client/bin/res/drawable/footbar_marker_1.png
diff --git a/client/bin/res/drawable/footbar_search.png b/client/bin/res/drawable/footbar_search.png
new file mode 100644
index 0000000..1169b79
--- /dev/null
+++ b/client/bin/res/drawable/footbar_search.png
diff --git a/client/bin/res/drawable/footbar_search_1.png b/client/bin/res/drawable/footbar_search_1.png
new file mode 100644
index 0000000..9dd9611
--- /dev/null
+++ b/client/bin/res/drawable/footbar_search_1.png
diff --git a/client/bin/res/drawable/footbar_select_bg.png b/client/bin/res/drawable/footbar_select_bg.png
new file mode 100644
index 0000000..3de79d6
--- /dev/null
+++ b/client/bin/res/drawable/footbar_select_bg.png
diff --git a/client/bin/res/drawable/footbar_settings.png b/client/bin/res/drawable/footbar_settings.png
new file mode 100644
index 0000000..040a673
--- /dev/null
+++ b/client/bin/res/drawable/footbar_settings.png
diff --git a/client/bin/res/drawable/footbar_settings_1.png b/client/bin/res/drawable/footbar_settings_1.png
new file mode 100644
index 0000000..05db6fb
--- /dev/null
+++ b/client/bin/res/drawable/footbar_settings_1.png
diff --git a/client/bin/res/drawable/footbar_unselect_bg.png b/client/bin/res/drawable/footbar_unselect_bg.png
new file mode 100644
index 0000000..fe14eb2
--- /dev/null
+++ b/client/bin/res/drawable/footbar_unselect_bg.png
diff --git a/client/bin/res/drawable/horizontal_line.png b/client/bin/res/drawable/horizontal_line.png
new file mode 100644
index 0000000..e56695f
--- /dev/null
+++ b/client/bin/res/drawable/horizontal_line.png
diff --git a/client/bin/res/drawable/navigation_back.png b/client/bin/res/drawable/navigation_back.png
new file mode 100644
index 0000000..901ba07
--- /dev/null
+++ b/client/bin/res/drawable/navigation_back.png
diff --git a/client/bin/res/drawable/navigation_back_1.png b/client/bin/res/drawable/navigation_back_1.png
new file mode 100644
index 0000000..59f6260
--- /dev/null
+++ b/client/bin/res/drawable/navigation_back_1.png
diff --git a/client/bin/res/drawable/title_logo.png b/client/bin/res/drawable/title_logo.png
new file mode 100644
index 0000000..d167c79
--- /dev/null
+++ b/client/bin/res/drawable/title_logo.png
diff --git a/client/bin/res/drawable/topbar_background.png b/client/bin/res/drawable/topbar_background.png
new file mode 100644
index 0000000..851f92f
--- /dev/null
+++ b/client/bin/res/drawable/topbar_background.png