From 7a606637907476942c1f6686137ada6898d7eb14 Mon Sep 17 00:00:00 2001
From: Teddy <ted.sybil@gmail.com>
Date: Mon, 26 Aug 2013 08:50:47 +0800
Subject: purged the repo

---
 client/Piztor/gen/com/macaroon/piztor/R.java       | 164 --------------
 client/Piztor/res/drawable/bottom_img.png          | Bin 525331 -> 0 bytes
 client/Piztor/res/drawable/footbar_background.png  | Bin 23943 -> 0 bytes
 .../res/drawable/footbar_btn_checkin_style.xml     |   7 -
 .../res/drawable/footbar_btn_fetch_style.xml       |   6 -
 .../res/drawable/footbar_btn_focus_style.xml       |   6 -
 .../res/drawable/footbar_btn_search_style.xml      |   6 -
 .../res/drawable/footbar_btn_settings_style.xml    |   6 -
 client/Piztor/res/drawable/footbar_checkin.png     | Bin 468 -> 0 bytes
 client/Piztor/res/drawable/footbar_checkin_1.png   | Bin 3371 -> 0 bytes
 client/Piztor/res/drawable/footbar_fetch.png       | Bin 2541 -> 0 bytes
 client/Piztor/res/drawable/footbar_fetch_1.png     | Bin 3093 -> 0 bytes
 client/Piztor/res/drawable/footbar_marker.png      | Bin 1866 -> 0 bytes
 client/Piztor/res/drawable/footbar_marker_1.png    | Bin 3288 -> 0 bytes
 client/Piztor/res/drawable/footbar_search.png      | Bin 2127 -> 0 bytes
 client/Piztor/res/drawable/footbar_search_1.png    | Bin 3589 -> 0 bytes
 client/Piztor/res/drawable/footbar_select_bg.png   | Bin 8919 -> 0 bytes
 client/Piztor/res/drawable/footbar_settings.png    | Bin 1372 -> 0 bytes
 client/Piztor/res/drawable/footbar_settings_1.png  | Bin 3442 -> 0 bytes
 client/Piztor/res/drawable/footbar_unselect_bg.png | Bin 165 -> 0 bytes
 client/Piztor/res/drawable/horizontal_line.png     | Bin 796 -> 0 bytes
 client/Piztor/res/drawable/navigation_back.png     | Bin 1324 -> 0 bytes
 client/Piztor/res/drawable/navigation_back_1.png   | Bin 401 -> 0 bytes
 client/Piztor/res/drawable/title_logo.png          | Bin 1031640 -> 0 bytes
 client/Piztor/res/drawable/topbar_background.png   | Bin 23763 -> 0 bytes
 client/Piztor/res/layout/activity_gather.xml       |  23 --
 client/Piztor/res/layout/activity_login.xml        |  92 --------
 client/Piztor/res/layout/activity_main.xml         |  23 --
 client/Piztor/res/layout/activity_setting.xml      | 149 -------------
 client/Piztor/res/layout/activity_settings.xml     | 149 -------------
 client/Piztor/res/layout/gather_footbar.xml        | 133 ------------
 client/Piztor/res/layout/gather_timer.xml          |  16 --
 client/Piztor/res/layout/login_bottom.xml          |  13 --
 client/Piztor/res/layout/main_footbar.xml          | 107 ---------
 client/Piztor/res/layout/main_headbar.xml          |  29 ---
 client/Piztor/res/layout/settings_headbar.xml      |  29 ---
 client/Piztor/res/menu/login.xml                   |   9 -
 client/Piztor/res/menu/setting.xml                 |   9 -
 client/Piztor/res/values/strings.xml               |  21 --
 .../Piztor/src/com/macaroon/piztor/GPSTracker.java | 241 ---------------------
 .../Piztor/src/com/macaroon/piztor/Infomation.java |  30 ---
 client/Piztor/src/com/macaroon/piztor/Login.java   | 106 ---------
 client/Piztor/src/com/macaroon/piztor/Main.java    | 205 ------------------
 .../src/com/macaroon/piztor/PiztorExcepiton.java   |  10 -
 client/Piztor/src/com/macaroon/piztor/Req.java     |  14 --
 .../src/com/macaroon/piztor/ReqLocation.java       |  14 --
 .../Piztor/src/com/macaroon/piztor/ReqLogin.java   |  16 --
 .../Piztor/src/com/macaroon/piztor/ReqUpdate.java  |  16 --
 client/Piztor/src/com/macaroon/piztor/Res.java     |  11 -
 .../src/com/macaroon/piztor/ResLocation.java       |  18 --
 .../Piztor/src/com/macaroon/piztor/ResLogin.java   |  15 --
 .../Piztor/src/com/macaroon/piztor/ResUpdate.java  |  13 --
 .../Piztor/src/com/macaroon/piztor/Rlocation.java  |  13 --
 client/Piztor/src/com/macaroon/piztor/Setting.java |  22 --
 .../src/com/macaroon/piztor/SocketClient.java      | 107 ---------
 client/Piztor/src/com/macaroon/piztor/Tracker.java |  66 ------
 client/Piztor/src/com/macaroon/piztor/Transam.java | 139 ------------
 57 files changed, 2053 deletions(-)
 delete mode 100644 client/Piztor/gen/com/macaroon/piztor/R.java
 delete mode 100644 client/Piztor/res/drawable/bottom_img.png
 delete mode 100644 client/Piztor/res/drawable/footbar_background.png
 delete mode 100644 client/Piztor/res/drawable/footbar_btn_checkin_style.xml
 delete mode 100644 client/Piztor/res/drawable/footbar_btn_fetch_style.xml
 delete mode 100644 client/Piztor/res/drawable/footbar_btn_focus_style.xml
 delete mode 100644 client/Piztor/res/drawable/footbar_btn_search_style.xml
 delete mode 100644 client/Piztor/res/drawable/footbar_btn_settings_style.xml
 delete mode 100644 client/Piztor/res/drawable/footbar_checkin.png
 delete mode 100644 client/Piztor/res/drawable/footbar_checkin_1.png
 delete mode 100644 client/Piztor/res/drawable/footbar_fetch.png
 delete mode 100644 client/Piztor/res/drawable/footbar_fetch_1.png
 delete mode 100644 client/Piztor/res/drawable/footbar_marker.png
 delete mode 100644 client/Piztor/res/drawable/footbar_marker_1.png
 delete mode 100644 client/Piztor/res/drawable/footbar_search.png
 delete mode 100644 client/Piztor/res/drawable/footbar_search_1.png
 delete mode 100644 client/Piztor/res/drawable/footbar_select_bg.png
 delete mode 100644 client/Piztor/res/drawable/footbar_settings.png
 delete mode 100644 client/Piztor/res/drawable/footbar_settings_1.png
 delete mode 100644 client/Piztor/res/drawable/footbar_unselect_bg.png
 delete mode 100644 client/Piztor/res/drawable/horizontal_line.png
 delete mode 100644 client/Piztor/res/drawable/navigation_back.png
 delete mode 100644 client/Piztor/res/drawable/navigation_back_1.png
 delete mode 100644 client/Piztor/res/drawable/title_logo.png
 delete mode 100644 client/Piztor/res/drawable/topbar_background.png
 delete mode 100644 client/Piztor/res/layout/activity_gather.xml
 delete mode 100644 client/Piztor/res/layout/activity_login.xml
 delete mode 100644 client/Piztor/res/layout/activity_main.xml
 delete mode 100644 client/Piztor/res/layout/activity_setting.xml
 delete mode 100644 client/Piztor/res/layout/activity_settings.xml
 delete mode 100644 client/Piztor/res/layout/gather_footbar.xml
 delete mode 100644 client/Piztor/res/layout/gather_timer.xml
 delete mode 100644 client/Piztor/res/layout/login_bottom.xml
 delete mode 100644 client/Piztor/res/layout/main_footbar.xml
 delete mode 100644 client/Piztor/res/layout/main_headbar.xml
 delete mode 100644 client/Piztor/res/layout/settings_headbar.xml
 delete mode 100644 client/Piztor/res/menu/login.xml
 delete mode 100644 client/Piztor/res/menu/setting.xml
 delete mode 100644 client/Piztor/res/values/strings.xml
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/GPSTracker.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/Infomation.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/Login.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/Main.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/PiztorExcepiton.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/Req.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/ReqLocation.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/ReqLogin.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/ReqUpdate.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/Res.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/ResLocation.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/ResLogin.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/ResUpdate.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/Rlocation.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/Setting.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/SocketClient.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/Tracker.java
 delete mode 100644 client/Piztor/src/com/macaroon/piztor/Transam.java

(limited to 'client/Piztor')

diff --git a/client/Piztor/gen/com/macaroon/piztor/R.java b/client/Piztor/gen/com/macaroon/piztor/R.java
deleted file mode 100644
index 3d07e1d..0000000
--- a/client/Piztor/gen/com/macaroon/piztor/R.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.macaroon.piztor;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class dimen {
-        /**  Default screen margins, per the Android Design guidelines. 
-
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-    
-         */
-        public static final int activity_horizontal_margin=0x7f040000;
-        public static final int activity_vertical_margin=0x7f040001;
-    }
-    public static final class drawable {
-        public static final int bottom_img=0x7f020000;
-        public static final int footbar_background=0x7f020001;
-        public static final int footbar_btn_checkin_style=0x7f020002;
-        public static final int footbar_btn_fetch_style=0x7f020003;
-        public static final int footbar_btn_focus_style=0x7f020004;
-        public static final int footbar_btn_search_style=0x7f020005;
-        public static final int footbar_btn_settings_style=0x7f020006;
-        public static final int footbar_checkin=0x7f020007;
-        public static final int footbar_checkin_1=0x7f020008;
-        public static final int footbar_fetch=0x7f020009;
-        public static final int footbar_fetch_1=0x7f02000a;
-        public static final int footbar_marker=0x7f02000b;
-        public static final int footbar_marker_1=0x7f02000c;
-        public static final int footbar_search=0x7f02000d;
-        public static final int footbar_search_1=0x7f02000e;
-        public static final int footbar_select_bg=0x7f02000f;
-        public static final int footbar_settings=0x7f020010;
-        public static final int footbar_settings_1=0x7f020011;
-        public static final int footbar_unselect_bg=0x7f020012;
-        public static final int horizontal_line=0x7f020013;
-        public static final int ic_launcher=0x7f020014;
-        public static final int navigation_back=0x7f020015;
-        public static final int navigation_back_1=0x7f020016;
-        public static final int title_logo=0x7f020017;
-        public static final int topbar_background=0x7f020018;
-    }
-    public static final class id {
-        public static final int action_settings=0x7f08002c;
-        public static final int footbar_btn_checkin=0x7f08001f;
-        public static final int footbar_btn_checkin_layout=0x7f08001e;
-        public static final int footbar_btn_checkin_text=0x7f080020;
-        public static final int footbar_btn_fetch=0x7f08001c;
-        public static final int footbar_btn_fetch_layout=0x7f08001b;
-        public static final int footbar_btn_fetch_text=0x7f08001d;
-        public static final int footbar_btn_focus=0x7f080022;
-        public static final int footbar_btn_focus_layout=0x7f080021;
-        public static final int footbar_btn_focus_text=0x7f080023;
-        public static final int footbar_btn_search=0x7f080019;
-        public static final int footbar_btn_search_layout=0x7f080018;
-        public static final int footbar_btn_search_text=0x7f08001a;
-        public static final int footbar_btn_settings=0x7f080025;
-        public static final int footbar_btn_settings_layout=0x7f080024;
-        public static final int footbar_btn_settings_text=0x7f080027;
-        public static final int gather_footbar_layout=0x7f080001;
-        public static final int gather_timer=0x7f080026;
-        public static final int gather_timer_layout=0x7f080000;
-        public static final int headbar_appname=0x7f080029;
-        public static final int headbar_logo=0x7f080028;
-        public static final int login_btn_login=0x7f080007;
-        public static final int main_footbar_layout=0x7f080009;
-        public static final int main_headbar_img=0x7f080002;
-        public static final int main_headbar_layout=0x7f080008;
-        public static final int settings_GPSrefreshrate=0x7f08000c;
-        public static final int settings_GPSrefreshrate_text=0x7f08000b;
-        public static final int settings_btn_back=0x7f08002a;
-        public static final int settings_headbar_layout=0x7f08000a;
-        public static final int settings_headbar_text=0x7f08002b;
-        public static final int settings_seperator1=0x7f08000d;
-        public static final int settings_seperator2=0x7f080012;
-        public static final int settings_seperator3=0x7f080017;
-        public static final int settings_sex_layout=0x7f08000e;
-        public static final int settings_sex_text=0x7f08000f;
-        public static final int settings_show_female=0x7f080011;
-        public static final int settings_show_male=0x7f080010;
-        public static final int settings_team_all=0x7f080016;
-        public static final int settings_team_layout=0x7f080013;
-        public static final int settings_team_mine=0x7f080015;
-        public static final int settings_team_text=0x7f080014;
-        public static final int user_id=0x7f080004;
-        public static final int user_id_text=0x7f080003;
-        public static final int user_pass=0x7f080006;
-        public static final int user_pass_text=0x7f080005;
-    }
-    public static final class layout {
-        public static final int activity_gather=0x7f030000;
-        public static final int activity_init=0x7f030001;
-        public static final int activity_login=0x7f030002;
-        public static final int activity_main=0x7f030003;
-        public static final int activity_setting=0x7f030004;
-        public static final int activity_settings=0x7f030005;
-        public static final int gather_footbar=0x7f030006;
-        public static final int gather_timer=0x7f030007;
-        public static final int login_bottom=0x7f030008;
-        public static final int main_footbar=0x7f030009;
-        public static final int main_headbar=0x7f03000a;
-        public static final int settings_headbar=0x7f03000b;
-    }
-    public static final class menu {
-        public static final int init=0x7f070000;
-        public static final int login=0x7f070001;
-        public static final int main=0x7f070002;
-        public static final int setting=0x7f070003;
-    }
-    public static final class string {
-        public static final int action_settings=0x7f050001;
-        public static final int all=0x7f05000c;
-        public static final int app_name=0x7f050000;
-        public static final int checkin=0x7f050006;
-        public static final int female=0x7f05000a;
-        public static final int fetch=0x7f050005;
-        public static final int focus=0x7f050007;
-        public static final int hello_world=0x7f050002;
-        public static final int male=0x7f050009;
-        public static final int mine=0x7f05000d;
-        public static final int search=0x7f050004;
-        public static final int settings=0x7f050003;
-        public static final int show_sex=0x7f050008;
-        public static final int show_team=0x7f05000b;
-        public static final int title_activity_login=0x7f05000e;
-        public static final int title_activity_main=0x7f05000f;
-        public static final int title_activity_setting=0x7f050010;
-    }
-    public static final class style {
-        /** 
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    
-
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        
-
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    
- API 11 theme customizations can go here. 
-
-        Base application theme for API 14+. This theme completely replaces
-        AppBaseTheme from BOTH res/values/styles.xml and
-        res/values-v11/styles.xml on API 14+ devices.
-    
- API 14 theme customizations can go here. 
-         */
-        public static final int AppBaseTheme=0x7f060000;
-        /**  Application theme. 
- All customizations that are NOT specific to a particular API-level can go here. 
-         */
-        public static final int AppTheme=0x7f060001;
-    }
-}
diff --git a/client/Piztor/res/drawable/bottom_img.png b/client/Piztor/res/drawable/bottom_img.png
deleted file mode 100644
index 2725ea8..0000000
Binary files a/client/Piztor/res/drawable/bottom_img.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/footbar_background.png b/client/Piztor/res/drawable/footbar_background.png
deleted file mode 100644
index 488e8f2..0000000
Binary files a/client/Piztor/res/drawable/footbar_background.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/footbar_btn_checkin_style.xml b/client/Piztor/res/drawable/footbar_btn_checkin_style.xml
deleted file mode 100644
index 6dbeb21..0000000
--- a/client/Piztor/res/drawable/footbar_btn_checkin_style.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:state_pressed="true" android:drawable="@drawable/footbar_checkin_1"></item>
-	<item android:state_pressed="false" android:drawable="@drawable/footbar_checkin"></item>
-
-</selector>
diff --git a/client/Piztor/res/drawable/footbar_btn_fetch_style.xml b/client/Piztor/res/drawable/footbar_btn_fetch_style.xml
deleted file mode 100644
index 379d526..0000000
--- a/client/Piztor/res/drawable/footbar_btn_fetch_style.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:state_pressed="true" android:drawable="@drawable/footbar_fetch_1"></item>
-    <item android:state_pressed="false" android:drawable="@drawable/footbar_fetch"></item>   
-</selector>
diff --git a/client/Piztor/res/drawable/footbar_btn_focus_style.xml b/client/Piztor/res/drawable/footbar_btn_focus_style.xml
deleted file mode 100644
index 5932f2f..0000000
--- a/client/Piztor/res/drawable/footbar_btn_focus_style.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:state_pressed="true" android:drawable="@drawable/footbar_marker_1"></item>
-	<item android:state_pressed="false" android:drawable="@drawable/footbar_marker"></item>   
-</selector>
diff --git a/client/Piztor/res/drawable/footbar_btn_search_style.xml b/client/Piztor/res/drawable/footbar_btn_search_style.xml
deleted file mode 100644
index ac786ef..0000000
--- a/client/Piztor/res/drawable/footbar_btn_search_style.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:state_pressed="true" android:drawable="@drawable/footbar_search_1"></item>
-    <item android:state_pressed="false" android:drawable="@drawable/footbar_search"></item>   
-</selector>
diff --git a/client/Piztor/res/drawable/footbar_btn_settings_style.xml b/client/Piztor/res/drawable/footbar_btn_settings_style.xml
deleted file mode 100644
index fca6230..0000000
--- a/client/Piztor/res/drawable/footbar_btn_settings_style.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:state_pressed="true" android:drawable="@drawable/footbar_settings_1"></item>
-    <item android:state_pressed="false" android:drawable="@drawable/footbar_settings"></item>   
-</selector>
diff --git a/client/Piztor/res/drawable/footbar_checkin.png b/client/Piztor/res/drawable/footbar_checkin.png
deleted file mode 100644
index 90afba7..0000000
Binary files a/client/Piztor/res/drawable/footbar_checkin.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/footbar_checkin_1.png b/client/Piztor/res/drawable/footbar_checkin_1.png
deleted file mode 100644
index a478d36..0000000
Binary files a/client/Piztor/res/drawable/footbar_checkin_1.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/footbar_fetch.png b/client/Piztor/res/drawable/footbar_fetch.png
deleted file mode 100644
index 32d24d2..0000000
Binary files a/client/Piztor/res/drawable/footbar_fetch.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/footbar_fetch_1.png b/client/Piztor/res/drawable/footbar_fetch_1.png
deleted file mode 100644
index 208094f..0000000
Binary files a/client/Piztor/res/drawable/footbar_fetch_1.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/footbar_marker.png b/client/Piztor/res/drawable/footbar_marker.png
deleted file mode 100644
index 3de909f..0000000
Binary files a/client/Piztor/res/drawable/footbar_marker.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/footbar_marker_1.png b/client/Piztor/res/drawable/footbar_marker_1.png
deleted file mode 100644
index 08c8715..0000000
Binary files a/client/Piztor/res/drawable/footbar_marker_1.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/footbar_search.png b/client/Piztor/res/drawable/footbar_search.png
deleted file mode 100644
index 3549f84..0000000
Binary files a/client/Piztor/res/drawable/footbar_search.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/footbar_search_1.png b/client/Piztor/res/drawable/footbar_search_1.png
deleted file mode 100644
index 1e6ac28..0000000
Binary files a/client/Piztor/res/drawable/footbar_search_1.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/footbar_select_bg.png b/client/Piztor/res/drawable/footbar_select_bg.png
deleted file mode 100644
index 9d7e5af..0000000
Binary files a/client/Piztor/res/drawable/footbar_select_bg.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/footbar_settings.png b/client/Piztor/res/drawable/footbar_settings.png
deleted file mode 100644
index 455bd0b..0000000
Binary files a/client/Piztor/res/drawable/footbar_settings.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/footbar_settings_1.png b/client/Piztor/res/drawable/footbar_settings_1.png
deleted file mode 100644
index 6b0a2ab..0000000
Binary files a/client/Piztor/res/drawable/footbar_settings_1.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/footbar_unselect_bg.png b/client/Piztor/res/drawable/footbar_unselect_bg.png
deleted file mode 100644
index 3e1e65e..0000000
Binary files a/client/Piztor/res/drawable/footbar_unselect_bg.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/horizontal_line.png b/client/Piztor/res/drawable/horizontal_line.png
deleted file mode 100644
index ccd6aa2..0000000
Binary files a/client/Piztor/res/drawable/horizontal_line.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/navigation_back.png b/client/Piztor/res/drawable/navigation_back.png
deleted file mode 100644
index 3bdda98..0000000
Binary files a/client/Piztor/res/drawable/navigation_back.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/navigation_back_1.png b/client/Piztor/res/drawable/navigation_back_1.png
deleted file mode 100644
index a20b4ef..0000000
Binary files a/client/Piztor/res/drawable/navigation_back_1.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/title_logo.png b/client/Piztor/res/drawable/title_logo.png
deleted file mode 100644
index 224040c..0000000
Binary files a/client/Piztor/res/drawable/title_logo.png and /dev/null differ
diff --git a/client/Piztor/res/drawable/topbar_background.png b/client/Piztor/res/drawable/topbar_background.png
deleted file mode 100644
index 9f0291e..0000000
Binary files a/client/Piztor/res/drawable/topbar_background.png and /dev/null differ
diff --git a/client/Piztor/res/layout/activity_gather.xml b/client/Piztor/res/layout/activity_gather.xml
deleted file mode 100644
index f887cf0..0000000
--- a/client/Piztor/res/layout/activity_gather.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:background="@android:color/white"
-	android:orientation="vertical">
-	<RelativeLayout 
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentTop="true"
-		android:id="@+id/gather_timer_layout"
-		>
-		<include layout="@layout/gather_timer"/>
-	</RelativeLayout>
-	<LinearLayout
-		android:id="@+id/gather_footbar_layout" 
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentBottom="true"
-		>
-		<include layout="@layout/gather_footbar"></include>
-	</LinearLayout>
-</RelativeLayout>
diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml
deleted file mode 100644
index cd2d34c..0000000
--- a/client/Piztor/res/layout/activity_login.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout  xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-	android:layout_height="fill_parent"
-	android:background="@android:color/black"
-	android:orientation="vertical">
-	
-<LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@android:color/black"
-    android:gravity="center_horizontal"
-    android:orientation="vertical" >
-    
-    <ImageView
-        android:id="@+id/main_headbar_img"
-        android:layout_width="180dp"
-        android:layout_height="240dp"
-        android:layout_gravity="center_horizontal"
-        android:src="@drawable/title_logo" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" 
-        android:layout_gravity="center">
-
-        <TableLayout 
-            android:layout_width="match_parent" 
-            android:layout_height="wrap_content">
-
-            <TableRow 
-                android:layout_marginBottom="15dp"
-                android:layout_marginTop="15dp">
-                <TextView 
-                    android:layout_width="0dp" 
-                    android:layout_height="wrap_content" 
-                    android:layout_weight="0.25"
-                    android:gravity="right" 
-                    android:id="@+id/user_id_text" 
-                    android:text="User ID" 
-                    android:textColor="@android:color/white"
-                     />
-
-                <EditText  
-                    android:layout_width="0dp"
-                                android:layout_weight="0.75"
-                    android:id="@+id/user_id"
-                    android:textColor="@android:color/black"
-                    android:singleLine="true"/>
-                    <requestFocus/>
-            </TableRow>
-
-            <TableRow>
-                <TextView 
-                    android:layout_width="0dp" 
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.25" 
-                    android:gravity="right" 
-                    android:id="@+id/user_pass_text" 
-                    android:text="Password" 
-                    android:textColor="@android:color/black"
-                />
-
-                <EditText  
-                    android:layout_width="0dp" 
-                    android:layout_weight="0.75"
-                    android:id="@+id/user_pass"           
-                    android:password="true"
-                    android:textColor="@android:color/black"
-                    android:singleLine="true"/>
-             </TableRow>     
-        </TableLayout>
-    </LinearLayout>
-	
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:orientation="vertical"
-        >
-    <Button
-        android:id="@+id/login_btn_login"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="Login"
-        android:textColor="@android:color/white" />
-    </LinearLayout>
-
-</LinearLayout>
-</RelativeLayout>
diff --git a/client/Piztor/res/layout/activity_main.xml b/client/Piztor/res/layout/activity_main.xml
deleted file mode 100644
index b2b61ac..0000000
--- a/client/Piztor/res/layout/activity_main.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:background="@android:color/white"
-	android:orientation="vertical">
-	<RelativeLayout 
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentTop="true"
-		android:id="@+id/main_headbar_layout"
-		>
-		<include layout="@layout/main_headbar"/>
-	</RelativeLayout>
-	<LinearLayout
-		android:id="@+id/main_footbar_layout" 
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentBottom="true"
-		>
-		<include layout="@layout/main_footbar"/>
-	</LinearLayout>
-</RelativeLayout>
diff --git a/client/Piztor/res/layout/activity_setting.xml b/client/Piztor/res/layout/activity_setting.xml
deleted file mode 100644
index 8ce051f..0000000
--- a/client/Piztor/res/layout/activity_setting.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:background="@drawable/topbar_background"
-	android:orientation="horizontal" >
-
-	<RelativeLayout
-		android:id="@+id/settings_headbar_layout"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentTop="true" >
-
-		<include layout="@layout/settings_headbar" />
-	</RelativeLayout>
-
-	<LinearLayout
-		android:layout_width="fill_parent"
-		android:layout_height="match_parent"
-		android:layout_marginTop="48dip"
-		android:orientation="vertical" >
-
-		<TextView
-			android:id="@+id/settings_GPSrefreshrate_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="GPS refresh rate"
-			android:layout_gravity="center"
-			android:layout_marginTop="10dip"
-			android:textSize="20dip"
-			android:textColor="@android:color/white" />
-
-		<SeekBar
-			android:id="@+id/settings_GPSrefreshrate"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content" />
-
-
-		<!-- LinearLayout
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal"
-			-->
-			<!-- TextView 
-				android:id="@+id/GPS_min_text"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="10dip"
-				android:text="1s"
-				android:textSize="10dip"
-				android:textColor="@android:color/white"/-->
-
-			<!--TextView
-			android:id="@+id/GPS_max_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:text="30s"
-			android:textColor="@android:color/white"
-			android:textSize="10dip" /-->
-
-			<!-- /LinearLayout --> <!-- end of gps text -->
-
-		<ImageView
-		    android:id="@+id/settings_seperator1"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:src="@drawable/horizontal_line" />
-
-		<LinearLayout
-		    android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:id="@+id/settings_sex_layout"
-		    android:layout_marginTop="10dip">
-
-			<TextView
-			    android:id="@+id/settings_sex_text"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_marginLeft="10dip"
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"
-			    android:text="@string/show_sex" />
-
-			<CheckBox
-			    android:id="@+id/settings_show_male"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/male" 
-			    android:textColor="@android:color/white"/>
-			
-
-			<CheckBox
-			    android:id="@+id/settings_show_female"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/female" 
-			    android:textColor="@android:color/white"/>
-
-		</LinearLayout>
-
-		<ImageView
-		    android:id="@+id/settings_seperator2"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:src="@drawable/horizontal_line" />
-
-		<LinearLayout
-		    android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:id="@+id/settings_team_layout"
-		    android:layout_marginTop="10dip">
-
-			<TextView
-			    android:id="@+id/settings_team_text"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_marginLeft="10dip"
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"
-			    android:text="@string/show_team" />
-
-			<RadioButton
-			    android:id="@+id/settings_team_mine"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/mine" 
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"/>
-
-			<RadioButton
-			    android:id="@+id/settings_team_all"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/all" 
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"/>
-
-		</LinearLayout>
-
-		<ImageView
-		    android:id="@+id/settings_seperator3"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:src="@drawable/horizontal_line" />
-
-		</LinearLayout>
-	</RelativeLayout>
diff --git a/client/Piztor/res/layout/activity_settings.xml b/client/Piztor/res/layout/activity_settings.xml
deleted file mode 100644
index 8ce051f..0000000
--- a/client/Piztor/res/layout/activity_settings.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:background="@drawable/topbar_background"
-	android:orientation="horizontal" >
-
-	<RelativeLayout
-		android:id="@+id/settings_headbar_layout"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentTop="true" >
-
-		<include layout="@layout/settings_headbar" />
-	</RelativeLayout>
-
-	<LinearLayout
-		android:layout_width="fill_parent"
-		android:layout_height="match_parent"
-		android:layout_marginTop="48dip"
-		android:orientation="vertical" >
-
-		<TextView
-			android:id="@+id/settings_GPSrefreshrate_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="GPS refresh rate"
-			android:layout_gravity="center"
-			android:layout_marginTop="10dip"
-			android:textSize="20dip"
-			android:textColor="@android:color/white" />
-
-		<SeekBar
-			android:id="@+id/settings_GPSrefreshrate"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content" />
-
-
-		<!-- LinearLayout
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal"
-			-->
-			<!-- TextView 
-				android:id="@+id/GPS_min_text"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="10dip"
-				android:text="1s"
-				android:textSize="10dip"
-				android:textColor="@android:color/white"/-->
-
-			<!--TextView
-			android:id="@+id/GPS_max_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:text="30s"
-			android:textColor="@android:color/white"
-			android:textSize="10dip" /-->
-
-			<!-- /LinearLayout --> <!-- end of gps text -->
-
-		<ImageView
-		    android:id="@+id/settings_seperator1"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:src="@drawable/horizontal_line" />
-
-		<LinearLayout
-		    android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:id="@+id/settings_sex_layout"
-		    android:layout_marginTop="10dip">
-
-			<TextView
-			    android:id="@+id/settings_sex_text"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_marginLeft="10dip"
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"
-			    android:text="@string/show_sex" />
-
-			<CheckBox
-			    android:id="@+id/settings_show_male"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/male" 
-			    android:textColor="@android:color/white"/>
-			
-
-			<CheckBox
-			    android:id="@+id/settings_show_female"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/female" 
-			    android:textColor="@android:color/white"/>
-
-		</LinearLayout>
-
-		<ImageView
-		    android:id="@+id/settings_seperator2"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:src="@drawable/horizontal_line" />
-
-		<LinearLayout
-		    android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:id="@+id/settings_team_layout"
-		    android:layout_marginTop="10dip">
-
-			<TextView
-			    android:id="@+id/settings_team_text"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_marginLeft="10dip"
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"
-			    android:text="@string/show_team" />
-
-			<RadioButton
-			    android:id="@+id/settings_team_mine"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/mine" 
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"/>
-
-			<RadioButton
-			    android:id="@+id/settings_team_all"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/all" 
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"/>
-
-		</LinearLayout>
-
-		<ImageView
-		    android:id="@+id/settings_seperator3"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:src="@drawable/horizontal_line" />
-
-		</LinearLayout>
-	</RelativeLayout>
diff --git a/client/Piztor/res/layout/gather_footbar.xml b/client/Piztor/res/layout/gather_footbar.xml
deleted file mode 100644
index e573032..0000000
--- a/client/Piztor/res/layout/gather_footbar.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="48dip"
-	android:orientation="horizontal"
-	android:background="@drawable/footbar_background" >
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_search_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton 
-			android:id="@+id/footbar_btn_search"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_search_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_search_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:layout_gravity="center"
-			android:text="@string/search"/>
-	</LinearLayout>
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_fetch_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton
-			android:id="@+id/footbar_btn_fetch"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_fetch_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_fetch_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:layout_gravity="center"
-			android:text="@string/fetch"/>
-	</LinearLayout>
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_checkin_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:layout_weight="1"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:orientation="vertical">
-		<ImageButton 
-			android:id="@+id/footbar_btn_checkin"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_checkin_style"
-			/>
-		<TextView 
-			android:id="@+id/footbar_btn_checkin_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:layout_gravity="center"
-			android:text="@string/checkin"/>
-	</LinearLayout>
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_focus_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton 
-			android:id="@+id/footbar_btn_focus"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_focus_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_focus_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:layout_gravity="center"
-			android:text="@string/focus"/>
-	</LinearLayout>
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_settings_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton
-			android:id="@+id/footbar_btn_settings"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_settings_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_settings"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:text="@string/settings"/>
-	</LinearLayout>
-
-</LinearLayout>
diff --git a/client/Piztor/res/layout/gather_timer.xml b/client/Piztor/res/layout/gather_timer.xml
deleted file mode 100644
index 3849f6b..0000000
--- a/client/Piztor/res/layout/gather_timer.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="48dip"
-	android:background="@android:color/black"
-	android:id="@+id/gather_timer_layout" >
-
-	<TextView
-		android:id="@+id/gather_timer"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_centerHorizontal="true"
-		android:textSize="40dip"
-		android:textColor="@android:color/white">
-	</TextView>
-</RelativeLayout>
diff --git a/client/Piztor/res/layout/login_bottom.xml b/client/Piztor/res/layout/login_bottom.xml
deleted file mode 100644
index e268c39..0000000
--- a/client/Piztor/res/layout/login_bottom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="200dip"
-	android:orientation="horizontal"
-	android:background="@drawable/footbar_background" >
-
-    <ImageView 
-        android:layout_width="fill_parent"
-        android:layout_height="120dip"
-        android:src="@drawable/bottom_img"/>
-
-</LinearLayout>
diff --git a/client/Piztor/res/layout/main_footbar.xml b/client/Piztor/res/layout/main_footbar.xml
deleted file mode 100644
index 69760c0..0000000
--- a/client/Piztor/res/layout/main_footbar.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="48dip"
-	android:orientation="horizontal"
-	android:background="@drawable/footbar_background" >
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_search_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton
-			android:id="@+id/footbar_btn_search"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_search_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_search"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:layout_gravity="center"
-			android:text="@string/search"/>
-	</LinearLayout>
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_fetch_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton 
-			android:id="@+id/footbar_btn_fetch"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_fetch_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_fetch_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:layout_gravity="center"
-			android:text="@string/fetch"/>
-	</LinearLayout>
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_focus_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton 
-			android:id="@+id/footbar_btn_focus"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_focus_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_focus_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:layout_gravity="center"
-			android:text="@string/focus"/>
-	</LinearLayout>
-
-	<LinearLayout 
-		android:id="@+id/footbar_btn_settings_layout"
-		android:layout_width="64dip"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="3dip"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1">
-		<ImageButton 
-			android:id="@+id/footbar_btn_settings"
-			android:layout_width="30dip"
-			android:layout_height="30dip"
-			android:layout_gravity="center"
-			android:background="@drawable/footbar_btn_settings_style"/>
-		<TextView 
-			android:id="@+id/footbar_btn_settings_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center"
-			android:textSize="10dip"
-			android:textColor="@android:color/white"
-			android:text="@string/settings"/>
-	</LinearLayout>
-
-</LinearLayout>
diff --git a/client/Piztor/res/layout/main_headbar.xml b/client/Piztor/res/layout/main_headbar.xml
deleted file mode 100644
index 137e3a1..0000000
--- a/client/Piztor/res/layout/main_headbar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="40dip"
-	android:background="@drawable/topbar_background"
-	android:id="@+id/main_headbar_layout" >
-
-	<ImageView 
-		android:id="@+id/headbar_logo"
-		android:layout_width="34dip"
-		android:layout_height="34dip"
-		android:layout_alignParentLeft="true"
-		android:layout_centerVertical="true"
-		android:layout_marginLeft="5dip"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/title_logo"/>
-
-	<TextView
-		android:id="@+id/headbar_appname"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_centerVertical="true"
-		android:layout_marginLeft="8dip"
-		android:textSize="26dip"
-		android:textColor="@android:color/white"
-		android:layout_toRightOf="@+id/headbar_logo"
-		android:text="@string/app_name" />
-
-</RelativeLayout>
diff --git a/client/Piztor/res/layout/settings_headbar.xml b/client/Piztor/res/layout/settings_headbar.xml
deleted file mode 100644
index 9065bdb..0000000
--- a/client/Piztor/res/layout/settings_headbar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="48dip"
-    android:background="@drawable/topbar_background"
-    android:id="@+id/settings_headbar_layout" >
-
-	<ImageButton 
-        android:id="@+id/settings_btn_back"
-        android:layout_width="40dip"
-        android:layout_height="40dip"
-        android:layout_marginLeft="5dip"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:background="@drawable/navigation_back"/>
-	
-    <TextView 
-        android:id="@+id/settings_headbar_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="30dip"
-        android:textColor="@android:color/white"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="40dip"
-        android:text="@string/settings"/>
-    
-
-</RelativeLayout>
diff --git a/client/Piztor/res/menu/login.xml b/client/Piztor/res/menu/login.xml
deleted file mode 100644
index c002028..0000000
--- a/client/Piztor/res/menu/login.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
-
-</menu>
diff --git a/client/Piztor/res/menu/setting.xml b/client/Piztor/res/menu/setting.xml
deleted file mode 100644
index c002028..0000000
--- a/client/Piztor/res/menu/setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
-
-</menu>
diff --git a/client/Piztor/res/values/strings.xml b/client/Piztor/res/values/strings.xml
deleted file mode 100644
index 5a5ccc4..0000000
--- a/client/Piztor/res/values/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<resources>
-
-    <string name="app_name">piztor</string>
-    <string name="action_settings">Settings</string>
-    <string name="hello_world">Hello world!</string>
-    <string name="settings">Settings</string>
-    <string name="search">Search</string>
-    <string name="fetch">Fetch</string>
-    <string name="checkin">Checkin</string>
-    <string name="focus">Focus</string>
-    <string name="show_sex">Show sex: </string>
-    <string name="male">Male</string>
-    <string name="female">Female</string>
-    <string name="show_team">Show team: </string>
-    <string name="all">All</string>
-    <string name="mine">Mine</string>
-    <string name="title_activity_login">Login</string>
-    <string name="title_activity_main">Main</string>
-    <string name="title_activity_setting">Setting</string>
-
-</resources>
diff --git a/client/Piztor/src/com/macaroon/piztor/GPSTracker.java b/client/Piztor/src/com/macaroon/piztor/GPSTracker.java
deleted file mode 100644
index 7e89d21..0000000
--- a/client/Piztor/src/com/macaroon/piztor/GPSTracker.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package com.macaroon.piztor;
-
-import android.app.AlertDialog;
-import android.app.Service;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.location.GpsStatus;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.SystemClock;
-import android.provider.Settings;
-import android.util.Log;
-
-public class GPSTracker extends Service implements LocationListener, GpsStatus.Listener {
-
-	private final Context mContext;
-
-	// flag for GPS status
-	boolean isGPSEnabled = false;
-
-	// flag for network status
-	boolean isNetworkEnabled = false;
-
-	// flag for GPS status
-	boolean canGetLocation = false;
-
-	Location location; // location
-	double latitude; // latitude
-	double longitude; // longitude
-
-	// The minimum distance to change Updates in meters
-	private static final long MIN_DISTANCE_CHANGE_FOR_UPDATES = 10; // 10 meters
-
-	// The minimum time between updates in milliseconds
-	private static final long MIN_TIME_BW_UPDATES = 1000 * 3; // 10 seconds
-
-	// Declaring a Location Manager
-	protected LocationManager locationManager;
-
-	// for GPS satellite status listener
-	Location mLastLocation;
-	long mLastLocationMillis;
-	boolean isGPSFix;
-
-
-	public GPSTracker(Context context) {
-		this.mContext = context;
-		isGPSFix = false;
-		getLocation();
-	}
-
-	public Location getLocation() {
-		try {
-			Log.d("getLocation", "Start getting location......");
-
-			locationManager = (LocationManager) mContext
-				.getSystemService(LOCATION_SERVICE);
-
-			// getting GPS status
-			isGPSEnabled = locationManager
-				.isProviderEnabled(LocationManager.GPS_PROVIDER);
-
-			// getting network status
-			isNetworkEnabled = locationManager
-				.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
-
-			if (!isGPSEnabled) {
-				// no network provider is enabled
-			} else {
-				this.canGetLocation = true;
-				if (isNetworkEnabled) {
-					locationManager.requestLocationUpdates(
-							LocationManager.NETWORK_PROVIDER,
-							MIN_TIME_BW_UPDATES,
-							MIN_DISTANCE_CHANGE_FOR_UPDATES, this);
-
-					Log.d("Network", "Network Updated");
-
-					if (locationManager != null) {
-						location = locationManager
-							.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
-						if (location != null) {
-							latitude = location.getLatitude();
-							longitude = location.getLongitude();
-
-							Log.d("Network", "Received Network Data");
-							System.out.println("***From Network: "+latitude + "  " + longitude);
-						}
-					}
-				}// end of network section
-				// if GPS Enabled get lat/long using GPS Services
-				if (isGPSEnabled) {
-					if (true) {
-						locationManager.requestLocationUpdates(
-								LocationManager.GPS_PROVIDER,
-								MIN_TIME_BW_UPDATES,
-								MIN_DISTANCE_CHANGE_FOR_UPDATES, this);
-						Log.d("GPS", "GPS Updated");
-						if (locationManager != null) {
-							location = locationManager
-								.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-							if (location != null) {
-								latitude = location.getLatitude();
-								longitude = location.getLongitude();
-
-								Log.d("GPS", "Received GPS Data");
-								System.out.println("***From GPS: "+latitude + "  " + longitude);
-
-							}
-						}
-					}
-				}// end of GPS section
-			}// end of fetching data
-			return location;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
-
-	/**
-	 * Stop using GPS listener Calling this function will stop using GPS in your
-	 * app
-	 * */
-	public void stopUsingGPS() {
-		if (locationManager != null) {
-			locationManager.removeUpdates(GPSTracker.this);
-		}
-	}
-
-	/**
-	 * Function to get latitude
-	 * */
-	public double getLatitude() {
-		if (location != null) {
-			latitude = location.getLatitude();
-		}
-		return latitude;
-	}
-
-	/**
-	 * Function to get longitude
-	 * */
-	public double getLongitude() {
-		if (location != null) {
-			longitude = location.getLongitude();
-		}
-		return longitude;
-	}
-
-	/**
-	 * Function to check GPS/wifi enabled
-	 * 
-	 * @return boolean
-	 * */
-	public boolean canGetLocation() {
-		return this.canGetLocation;
-	}
-
-	public boolean isGPSFix() {
-		return (this.isGPSFix && location != null);
-	}
-
-	/**
-	 * Function to show settings alert dialog On pressing Settings button will
-	 * lauch Settings Options
-	 * */
-	public void showSettingsAlert() {
-		AlertDialog.Builder alertDialog = new AlertDialog.Builder(mContext);
-
-		// Setting Dialog Title
-		alertDialog.setTitle("GPS is settings");
-
-		// Setting Dialog Message
-		alertDialog
-			.setMessage("GPS is not enabled. Do you want to go to settings menu?");
-
-		// On pressing Settings button
-		alertDialog.setPositiveButton("Settings",
-				new DialogInterface.OnClickListener() {
-					public void onClick(DialogInterface dialog, int which) {
-						Intent intent = new Intent(
-							Settings.ACTION_LOCATION_SOURCE_SETTINGS);
-						mContext.startActivity(intent);
-					}
-				});
-
-		// on pressing cancel button
-		alertDialog.setNegativeButton("Cancel",
-				new DialogInterface.OnClickListener() {
-					public void onClick(DialogInterface dialog, int which) {
-						dialog.cancel();
-					}
-				});
-
-		// Showing Alert Message
-		alertDialog.show();
-	}
-
-	@Override
-	public void onLocationChanged(Location location) {
-		if (location == null) return;
-		mLastLocationMillis = SystemClock.elapsedRealtime();
-		mLastLocation = location;
-	}
-
-	@Override
-	public void onProviderDisabled(String provider) {
-	}
-
-	@Override
-	public void onProviderEnabled(String provider) {
-	}
-
-	@Override
-	public void onStatusChanged(String provider, int status, Bundle extras) {
-	}
-
-	@Override
-	public IBinder onBind(Intent arg0) {
-		return null;
-	}
-
-	@Override
-	public void onGpsStatusChanged(int event) {
-		switch (event) {
-			case GpsStatus.GPS_EVENT_SATELLITE_STATUS:
-				if(mLastLocation != null)
-					isGPSFix = (SystemClock.elapsedRealtime() - mLastLocationMillis) < 3000;
-				break;
-
-			case GpsStatus.GPS_EVENT_FIRST_FIX:
-				isGPSFix = true;
-				break;
-		}
-	}
-}
diff --git a/client/Piztor/src/com/macaroon/piztor/Infomation.java b/client/Piztor/src/com/macaroon/piztor/Infomation.java
deleted file mode 100644
index d989280..0000000
--- a/client/Piztor/src/com/macaroon/piztor/Infomation.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.macaroon.piztor;
-
-import android.annotation.SuppressLint;
-import java.util.HashMap;
-import java.util.Vector;
-
-public class Infomation {
-	static String ip = "69.85.86.42";
-	static int port = 9990;
-	static int token = -1;
-	static int myId = -1;
-	static int myGroup = -1;
-	class UserInfo {
-		int id;
-		double lat, lot;
-	}
-
-	class Group {
-		int id;
-		Vector<UserInfo> v;
-	}
-	
-	static HashMap<Integer, Group> mp;
-	
-	@SuppressLint("UseSparseArrays")
-	static void init() {
-		mp = new HashMap<Integer, Group>();
-	}
-	
-}
diff --git a/client/Piztor/src/com/macaroon/piztor/Login.java b/client/Piztor/src/com/macaroon/piztor/Login.java
deleted file mode 100644
index a92b9c7..0000000
--- a/client/Piztor/src/com/macaroon/piztor/Login.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.macaroon.piztor;
-
-import android.annotation.SuppressLint;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.Menu;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-
-public class Login extends PiztorAct {
-	
-	
-	ActMgr actMgr;
-	Button btnLogin;
-	EditText edtUser, edtPass;
-
-	int loginButtonClick = 1, retryButtonClick = 2, loginFailed = 3;
-	
-	@SuppressLint("HandlerLeak")
-	Handler hand = new Handler() {
-		@Override
-		public void handleMessage(Message m) {
-			System.out.println(m.what);
-			if (m.what == 0) {
-				ResLogin res = (ResLogin) m.obj;
-				Infomation.token = res.t;
-				actMgr.trigger(AppMgr.loginSuccess);
-			} else if (m.what == 101) {
-				actMgr.trigger(loginFailed);
-			}
-		}
-	};
-	
-	class StartStatus extends ActStatus {
-
-		@Override
-		void enter(int e) {
-		}
-
-		@Override
-		void leave(int e) {
-		}
-	}
-	
-	class LoginStatus extends ActStatus {
-
-		@Override
-		void enter(int e) {
-			String user = edtUser.getText().toString();
-			String pass = edtPass.getText().toString();
-			long nowtime = System.currentTimeMillis();
-			System.out.println(user + " : " + pass + "\n");
-			AppMgr.transam.send(new ReqLogin(user, pass, nowtime, 1000));
-		}
-
-		@Override
-		void leave(int e) {
-			//TODO log out failed!
-		}
-		
-	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		id = "login";
-		super.onCreate(savedInstanceState);
-		ActStatus[] r = new ActStatus[2];
-		AppMgr.transam.setHandler(hand);
-		r[0] = new StartStatus();
-		r[1] = new LoginStatus();
-		actMgr = new ActMgr(this, r[0], r);
-		actMgr.add(r[0], loginButtonClick, r[1]);
-		actMgr.add(r[1], loginFailed, r[0]);
-		setContentView(R.layout.activity_login);
-	}
-
-	@Override
-	protected void onStart() {
-		super.onStart();
-		btnLogin = (Button) findViewById(R.id.login_btn_login);
-		edtUser = (EditText) findViewById(R.id.user_id);
-		edtPass = (EditText) findViewById(R.id.user_pass);
-		btnLogin.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				actMgr.trigger(loginButtonClick);
-			}
-		});
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-	
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		// Inflate the menu; this adds items to the action bar if it is present.
-		getMenuInflater().inflate(R.menu.login, menu);
-		return true;
-	}
-
-}
diff --git a/client/Piztor/src/com/macaroon/piztor/Main.java b/client/Piztor/src/com/macaroon/piztor/Main.java
deleted file mode 100644
index d111711..0000000
--- a/client/Piztor/src/com/macaroon/piztor/Main.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package com.macaroon.piztor;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.Vector;
-
-import android.annotation.SuppressLint;
-import android.location.Location;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.Menu;
-import android.view.View;
-import android.widget.ImageButton;
-
-public class Main extends PiztorAct {
-	final static int SearchButtonPress = 1;
-	final static int FetchButtonPress = 2;
-	final static int FocuseButtonPress = 3;
-	final static int SuccessFetch = 4;
-	final static int FailedFetch = 5;
-	final static int TimerFlush = 6;
-	ActMgr actMgr;
-	ImageButton btnSearch, btnFetch, btnFocus, btnSettings;
-	Timer autodate;
-	@SuppressLint("HandlerLeak")
-	Handler fromGPS = new Handler() {
-		@Override
-		public void handleMessage(Message m) {
-			if (m.what != 0) {
-				Location l = (Location) m.obj;
-				if (l == null)
-					System.out.println("fuck!!!");
-				else {
-					ReqUpdate r = new ReqUpdate(Infomation.token,
-							l.getLatitude(), l.getLongitude(),
-							System.currentTimeMillis(), 1000);
-					AppMgr.transam.send(r);
-				}
-			}
-		}
-	};
-
-	Handler fromTransam = new Handler() {
-		@Override
-		public void handleMessage(Message m) {
-			switch (m.what) {
-			case 3:
-				ResLocation location = (ResLocation) m.obj;
-				for (int i = 0; i < location.n; i++) {
-					System.out.println(location.l.get(i).lat + " "
-							+ location.l.get(i).lot);
-				}
-				actMgr.trigger(SuccessFetch);
-				break;
-			case 2:
-				ResUpdate update = (ResUpdate) m.obj;
-				if (update.t == 0)
-					System.out.println("update success");
-				else
-					System.out.println("update failed");
-				break;
-			default:
-				break;
-			}
-
-		}
-	};
-
-	String cause(int t) {
-		switch (t) {
-		case SearchButtonPress:
-			return "Search Button Press";
-		case FetchButtonPress:
-			return "Fetch Button Press";
-		case FocuseButtonPress:
-			return "Focuse Button Press";
-		case SuccessFetch:
-			return "Success Fetch";
-		case FailedFetch:
-			return "Failed Fetch";
-		case TimerFlush:
-			return "TimerFlush";
-		default:
-			return "Fuck!!!";
-		}
-	}
-
-	class StartStatus extends ActStatus {
-
-		@Override
-		void enter(int e) {
-			System.out.println("enter start status!!!!");
-			if (e == TimerFlush) {
-				ReqLocation r = new ReqLocation(Infomation.token, 1,
-						System.currentTimeMillis(), 1000);
-				AppMgr.transam.send(r);
-			}
-		}
-
-		@Override
-		void leave(int e) {
-			System.out.println("leave start status!!!! because" + cause(e));
-		}
-
-	}
-
-	class FetchStatus extends ActStatus {
-
-		@Override
-		void enter(int e) {
-			System.out.println("enter Fetch status!!!!");
-			if (e == FetchButtonPress) {
-				ReqLocation r = new ReqLocation(Infomation.token, 1,
-						System.currentTimeMillis(), 1000);
-				AppMgr.transam.send(r);
-			}
-		}
-
-		@Override
-		void leave(int e) {
-			System.out.println("leave fetch status!!!! because" + cause(e));
-		}
-
-	}
-
-	class FocusStatus extends ActStatus {
-
-		@Override
-		void enter(int e) {
-			System.out.println("enter focus status!!!!");
-
-		}
-
-		@Override
-		void leave(int e) {
-			System.out.println("leave focus status!!!! because" + cause(e));
-
-		}
-
-	}
-
-	class AutoUpdate extends TimerTask {
-
-		@Override
-		public void run() {
-			actMgr.trigger(Main.TimerFlush);
-		}
-
-	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		id = "Main";
-		super.onCreate(savedInstanceState);
-		AppMgr.tracker.setHandler(fromGPS);
-		ActStatus[] r = new ActStatus[3];
-		r[0] = new StartStatus();
-		r[1] = new FetchStatus();
-		r[2] = new FocusStatus();
-		actMgr = new ActMgr(this, r[0], r);
-		actMgr.add(r[0], FocuseButtonPress, r[2]);
-		actMgr.add(r[0], FetchButtonPress, r[1]);
-		actMgr.add(r[0], SuccessFetch, r[0]);
-		actMgr.add(r[1], FetchButtonPress, r[0]);
-		actMgr.add(r[1], FailedFetch, r[0]);
-		actMgr.add(r[1], SuccessFetch, r[0]);
-		actMgr.add(r[2], FocuseButtonPress, r[0]);
-		actMgr.add(r[0], TimerFlush, r[0]);
-		actMgr.add(r[2], TimerFlush, r[2]);
-		autodate = new Timer();
-		AppMgr.transam.setHandler(fromTransam);
-		setContentView(R.layout.activity_main);
-	}
-
-	@Override
-	protected void onStart() {
-		super.onStart();
-		btnFetch = (ImageButton) findViewById(R.id.footbar_btn_fetch);
-		btnFocus = (ImageButton) findViewById(R.id.footbar_btn_focus);
-		btnSearch = (ImageButton) findViewById(R.id.footbar_btn_search);
-		btnSettings = (ImageButton) findViewById(R.id.footbar_btn_settings);
-		btnFetch.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				actMgr.trigger(FetchButtonPress);
-			}
-		});
-		btnFocus.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				actMgr.trigger(FocuseButtonPress);
-			}
-		});
-		autodate.schedule(new AutoUpdate(), 0, 5000);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		// Inflate the menu; this adds items to the action bar if it is present.
-		getMenuInflater().inflate(R.menu.main, menu);
-		return true;
-	}
-
-}
diff --git a/client/Piztor/src/com/macaroon/piztor/PiztorExcepiton.java b/client/Piztor/src/com/macaroon/piztor/PiztorExcepiton.java
deleted file mode 100644
index 6d1861a..0000000
--- a/client/Piztor/src/com/macaroon/piztor/PiztorExcepiton.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.macaroon.piztor;
-
-class PiztorExcepiton extends Exception{
-	private static final long serialVersionUID = -7147530695009854988L;
-
-}
-
-class ClassCannotFind extends PiztorExcepiton {
-	//private class 
-}
diff --git a/client/Piztor/src/com/macaroon/piztor/Req.java b/client/Piztor/src/com/macaroon/piztor/Req.java
deleted file mode 100644
index 32988b8..0000000
--- a/client/Piztor/src/com/macaroon/piztor/Req.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.macaroon.piztor;
-
-public class Req{
-	int type;		//request type
-	int token;		//authentciation
-	long time;		//current time
-	long alive;		//alive time
-	Req(int t,int k,long tm,long av){
-		type = t;
-		token = k;
-		time = tm;
-		alive = av;
-	}
-}
\ No newline at end of file
diff --git a/client/Piztor/src/com/macaroon/piztor/ReqLocation.java b/client/Piztor/src/com/macaroon/piztor/ReqLocation.java
deleted file mode 100644
index 000f373..0000000
--- a/client/Piztor/src/com/macaroon/piztor/ReqLocation.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.macaroon.piztor;
-
-//--------------------------------------//
-//			Ask Location				//
-//--------------------------------------//
-
-public class ReqLocation extends Req{
-	int gid;	//group id;
-	
-	ReqLocation(int token,int groupid,long time,long alive){
-		super(3,token,time,alive);	//for type 3
-		gid = groupid;
-	}
-}
\ No newline at end of file
diff --git a/client/Piztor/src/com/macaroon/piztor/ReqLogin.java b/client/Piztor/src/com/macaroon/piztor/ReqLogin.java
deleted file mode 100644
index 294cae3..0000000
--- a/client/Piztor/src/com/macaroon/piztor/ReqLogin.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.macaroon.piztor;
-
-//--------------------------------------//
-//			authentication				//
-//--------------------------------------//
-
-public class ReqLogin extends Req{
-	String user;	//username
-	String pass;	//password
-	
-	ReqLogin(String u,String p,long time,long alive){
-		super(0,0,time,alive);	//for type 0
-		user = u;
-		pass = p;
-	}
-}
\ No newline at end of file
diff --git a/client/Piztor/src/com/macaroon/piztor/ReqUpdate.java b/client/Piztor/src/com/macaroon/piztor/ReqUpdate.java
deleted file mode 100644
index e4b1497..0000000
--- a/client/Piztor/src/com/macaroon/piztor/ReqUpdate.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.macaroon.piztor;
-
-//--------------------------------------//
-//			Update Location				//
-//--------------------------------------//
-
-public class ReqUpdate extends Req{
-	double lat;	//latitude
-	double lot; //longitude
-	
-	ReqUpdate(int token,double latitude,double longitude,long time,long alive){
-		super(2,token,time,alive);	//for type 2
-		lat = latitude;
-		lot = longitude;
-	}
-}
\ No newline at end of file
diff --git a/client/Piztor/src/com/macaroon/piztor/Res.java b/client/Piztor/src/com/macaroon/piztor/Res.java
deleted file mode 100644
index 98af108..0000000
--- a/client/Piztor/src/com/macaroon/piztor/Res.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.macaroon.piztor;
-
-public class Res{
-	int t;
-	int s;
-	Res(int type,int status){
-		t = type;
-		s = status;
-	}
-}
-
diff --git a/client/Piztor/src/com/macaroon/piztor/ResLocation.java b/client/Piztor/src/com/macaroon/piztor/ResLocation.java
deleted file mode 100644
index eb90840..0000000
--- a/client/Piztor/src/com/macaroon/piztor/ResLocation.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.macaroon.piztor;
-
-import java.util.Vector;
-
-//--------------------------------------//
-//			  Location Info			    //
-//--------------------------------------//
-
-public class ResLocation extends Res{
-	Vector<Rlocation> l;	//vector for location info
-	int n;					//number of location info
-	
-	ResLocation(int num,Vector<Rlocation> locationvec){
-		super(3,255);	//for type 3
-		l = locationvec;
-		n = num;
-	}
-}
\ No newline at end of file
diff --git a/client/Piztor/src/com/macaroon/piztor/ResLogin.java b/client/Piztor/src/com/macaroon/piztor/ResLogin.java
deleted file mode 100644
index 5b597a4..0000000
--- a/client/Piztor/src/com/macaroon/piztor/ResLogin.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.macaroon.piztor;
-
-
-//--------------------------------------//
-//	         Respond to login			//
-//--------------------------------------//
-
-public class ResLogin extends Res{
-	int t;	//user token
-	
-	ResLogin(int token,int status){
-		super(0,status);	//for type 0
-		t = token;
-	}
-}
\ No newline at end of file
diff --git a/client/Piztor/src/com/macaroon/piztor/ResUpdate.java b/client/Piztor/src/com/macaroon/piztor/ResUpdate.java
deleted file mode 100644
index 727eaa3..0000000
--- a/client/Piztor/src/com/macaroon/piztor/ResUpdate.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.macaroon.piztor;
-
-
-//--------------------------------------//
-//	   Respond to update location		//
-//--------------------------------------//
-
-public class ResUpdate extends Res{
-	
-	ResUpdate(int status){
-		super(2,status);	//for type 2
-	}
-}
\ No newline at end of file
diff --git a/client/Piztor/src/com/macaroon/piztor/Rlocation.java b/client/Piztor/src/com/macaroon/piztor/Rlocation.java
deleted file mode 100644
index 142cc9b..0000000
--- a/client/Piztor/src/com/macaroon/piztor/Rlocation.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.macaroon.piztor;
-
-class Rlocation{
-	int i;		//id
-	double lat;	//latitude
-	double lot; //longitude
-	
-	Rlocation(int id,double latitude,double longitude){
-		i = id;
-		lat = latitude;
-		lot = longitude;
-	}
-}
\ No newline at end of file
diff --git a/client/Piztor/src/com/macaroon/piztor/Setting.java b/client/Piztor/src/com/macaroon/piztor/Setting.java
deleted file mode 100644
index 610333f..0000000
--- a/client/Piztor/src/com/macaroon/piztor/Setting.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.macaroon.piztor;
-
-import android.os.Bundle;
-import android.app.Activity;
-import android.view.Menu;
-
-public class Setting extends Activity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_setting);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		// Inflate the menu; this adds items to the action bar if it is present.
-		getMenuInflater().inflate(R.menu.setting, menu);
-		return true;
-	}
-
-}
diff --git a/client/Piztor/src/com/macaroon/piztor/SocketClient.java b/client/Piztor/src/com/macaroon/piztor/SocketClient.java
deleted file mode 100644
index 18c19da..0000000
--- a/client/Piztor/src/com/macaroon/piztor/SocketClient.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.macaroon.piztor;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.Vector;
-
-import android.os.Handler;
-import android.os.Message;
-
-public class SocketClient {
-	static Socket client;
-
-	public SocketClient(String site, int port) throws UnknownHostException,
-			IOException {
-		try {
-			client = new Socket(site, port);
-		} catch (UnknownHostException e) {
-			throw e;
-		} catch (IOException e) {
-			throw e;
-		}
-	}
-
-	public void sendMsg(Req req,Handler recall) throws IOException {
-		try {
-			DataOutputStream out = new DataOutputStream(
-					client.getOutputStream());
-			int tmp = req.type;
-			out.writeByte(tmp);
-			switch (tmp) {
-			case 0:
-				ReqLogin rau = (ReqLogin) req;
-				String id = rau.user;
-				String pa = rau.pass;
-				out.writeBytes(id + "\0" + pa);
-				break;
-			case 2:
-				ReqUpdate rup = (ReqUpdate) req;
-				int tk2 = rup.token;
-				double slat = rup.lat;
-				double slot = rup.lot;
-				out.writeInt(tk2);
-				out.writeDouble(slat);
-				out.writeDouble(slot);
-				break;
-			case 3:
-				ReqLocation ras = (ReqLocation) req;
-				int tk3 = ras.token;
-				int gid = ras.gid;
-				out.writeInt(tk3);
-				out.writeInt(gid);
-				break;
-			}
-			out.flush();
-			client.shutdownOutput();
-			DataInputStream in = new DataInputStream(client.getInputStream());
-			Message msg = new Message();
-			int type = in.readUnsignedByte();
-			switch (type) {
-			case 0:
-				int id = in.readInt();
-				int status = in.readUnsignedByte();
-				ResLogin rchklogin = new ResLogin(id,status);
-				msg.obj = rchklogin;
-				msg.what = 0;
-				recall.sendMessage(msg);
-				break;
-			case 2:
-				int status1 = in.readUnsignedByte();
-				ResUpdate rchkupd = new ResUpdate(status1);
-				msg.obj = rchkupd;
-				msg.what = 1;
-				recall.sendMessage(msg);
-				break;
-			case 3:
-				int n = in.readInt();
-				Vector<Rlocation> tmpv = new Vector<Rlocation>();
-				for (int i = 1; i <= n; i++) {
-					int tid = in.readInt();
-					double lat = in.readDouble();
-					double lot = in.readDouble();
-					tmpv.add(new Rlocation(tid,lat,lot));
-				}
-				ResLocation rlocin = new ResLocation(n,tmpv);
-				msg.obj = rlocin;
-				msg.what = 3;
-				recall.sendMessage(msg);
-				break;
-			}
-
-		} catch (IOException e) {
-			throw e;
-		}
-	}
-
-	public void closeSocket() {
-		try {
-			client.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-}
diff --git a/client/Piztor/src/com/macaroon/piztor/Tracker.java b/client/Piztor/src/com/macaroon/piztor/Tracker.java
deleted file mode 100644
index db9c151..0000000
--- a/client/Piztor/src/com/macaroon/piztor/Tracker.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.macaroon.piztor;
-
-import android.content.Context;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import android.location.Location;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-
-
-public class Tracker implements Runnable {
-
-	private static final long TIME_DELTA = 1000 * 3; // 3 second
-	public Timer timer;
-	private final Context mContext;
-	GPSTracker myTracker;
-	Handler mHandler;
-	Message message;
-
-	public Tracker(Context context, Handler yHandler) {
-		timer = new Timer();
-		mContext = context;
-		myTracker = new GPSTracker(mContext);
-		mHandler = yHandler;
-	}
-	
-	void setHandler(Handler hand) {
-		mHandler = hand;
-	}
-	
-
-	public void run() {
-		GPSTask myTask = new GPSTask();
-		timer.schedule(myTask, 0, TIME_DELTA);
-	}	
-	
-	class GPSTask extends TimerTask {
-		@Override
-		public void run() {
-			Location location = myTracker.getLocation();
-			Log.d("Location", "Fetching location.....");
-			if (myTracker.canGetLocation()) {
-				
-//				Log.d("TTTTTTTTTTTTTTTTTTTTTTTime","TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTime");
-//				System.out.println("GPSTIME" + myTracker.location.getTime());
-//				System.out.println("SYSTIME" + SystemClock.elapsedRealtime());
-				
-				message = new Message();
-				message.what = 0;
-				message.obj = location;
-				if(myTracker.isGPSFix()) {
-					message.what = 1;
-				} else {
-					message.what = 2;
-				}
-				mHandler.sendMessage(message);
-			} else {
-				message = new Message();
-				message.what = 0;
-				mHandler.sendMessage(message);
-			}
-		}
-	}
-}
diff --git a/client/Piztor/src/com/macaroon/piztor/Transam.java b/client/Piztor/src/com/macaroon/piztor/Transam.java
deleted file mode 100644
index 3410502..0000000
--- a/client/Piztor/src/com/macaroon/piztor/Transam.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.macaroon.piztor;
-
-import java.io.IOException;
-import java.net.UnknownHostException;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import android.annotation.SuppressLint;
-import android.os.Handler;
-import android.os.Message;
-
-public class Transam implements Runnable {
-	
-	public Timer timer;
-	public Timer mtimer;
-	public boolean running = false;
-	public boolean flag = true;
-	public int cnt = 4;
-	Res res;
-	Req req;
-	public int p; // port
-	public String i; // ip
-	Thread thread;
-	Handler core;
-	Handler recall; // recall
-	Queue<Req> reqtask; // request task
-
-	Transam(String ip, int port, Handler Recall) {
-		p = port;
-		i = ip;
-		recall = Recall;
-		reqtask = new LinkedList<Req>();
-	}
-
-	public void send(Req r) {
-		reqtask.offer(r);
-
-	}
-	
-	public void setHandler(Handler Recall) {
-		recall = Recall;
-		reqtask.clear();
-	}
-
-	public void run() { // start the main timer
-		// TimerTask tmain = new Timertk();
-		// mtimer = new Timer();
-		// mtimer.schedule(tmain, 100, 100); //check the queue for every 100
-		// msec
-
-		while (true) {
-			if (running == false) {
-
-				if (!reqtask.isEmpty()) { // poll the head request
-					req = reqtask.poll();
-					if (req.time + req.alive < System.currentTimeMillis()) { // time
-																				// out!
-						Message ret = new Message();
-						ret.obj = "Time out!";
-						ret.what = 100;
-						recall.sendMessage(ret);
-					} else { // run the request
-						final thd t = new thd();
-						flag = false;
-						thread = new Thread(t);
-						cnt = 4;
-						running = true;
-						thread.start();
-						timer = new Timer();
-						TimerTask task = new Timertk();
-						timer.schedule(task, 2000, 2000);
-					}
-				}
-			}
-		}
-	}
-
-	class tmain extends TimerTask {
-		public void run() {
-
-		}
-	};
-
-	class thd implements Runnable {
-		public void run() {
-			try {
-				SocketClient client = new SocketClient(i, p);
-				client.sendMsg(req, recall);
-				Message msg = new Message();
-				msg.what = 1;
-				handler.sendMessage(msg);
-				client.closeSocket();
-			} catch (UnknownHostException e) {
-				e.printStackTrace();
-				System.out.println("UnknownHostException");
-			} catch (IOException e) {
-				e.printStackTrace();
-				System.out.println("IOException");
-			}
-
-		}
-	}
-
-	@SuppressLint("HandlerLeak")
-	Handler handler = new Handler() {
-		public void handleMessage(Message msg) {
-			switch (msg.what) {
-			case 1:
-				flag = true;
-				break;
-			case 2:
-				final thd t = new thd();
-				thread = new Thread(t);
-				thread.start();
-				break;
-			}
-			super.handleMessage(msg);
-		}
-	};
-
-	class Timertk extends TimerTask {
-		public void run() {
-			if (flag == false && cnt > 0) {
-				cnt--;
-			} else if (cnt == 0) {
-				Message msg = new Message();
-				msg.obj = "connecting failed";
-				msg.what = 101;
-				recall.sendMessage(msg);
-				timer.cancel();
-			} else if (flag == true) {
-				timer.cancel();
-				running = false;
-			}
-		}
-	};
-}
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2