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

1 files changed, 0 insertions, 33 deletions

diff --git a/client/gps-demo/AndroidGPSTracking/src/com/example/gpstracking/Tracker.java b/client/gps-demo/AndroidGPSTracking/src/com/example/gpstracking/Tracker.java
deleted file mode 100644
index 2e08a91..0000000
--- a/client/gps-demo/AndroidGPSTracking/src/com/example/gpstracking/Tracker.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.example.gpstracking;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-public class Tracker implements Runnable {
-
-	private static final long TIME_DELTA = 1000 * 60 * 5;	
-
-	Controller controller;
-
-	public Tracker(Controller newController) {
-		controller = newController;
-	}
-
-	public void run() {
-		public Timer timer;
-		TimerTask task = new GPSTask();	
-		timer.schedule(new GPSTask(), 0, TIME_DELTA);
-	}
-
-	class GPSTask extends TimerTask {
-		public void run() {
-			GPSTracker tracker;
-			tracker = new GPSTracker(Tracker.this);
-
-			double latitude = tracker.getLatitude();
-			double longitude = tracker.getLongitude();
-
-			controller.recieveLocation(latitude, longitude);
-		}
-	}
-}