List of most active apps. Hooray.
 On branch mostactive
	modified:   AndroidManifest.xml
	new file:   res/layout-hdpi/active_app.xml
	new file:   res/layout/active_app.xml
	modified:   res/layout/activity_data.xml
	new file:   src/com/odo/kcl/mobileminer/ActiveAppFragment.java
	modified:   src/com/odo/kcl/mobileminer/CkanUidRequest.java
	modified:   src/com/odo/kcl/mobileminer/DataActivity.java
	modified:   src/com/odo/kcl/mobileminer/MainActivity.java
	modified:   src/com/odo/kcl/mobileminer/MinerData.java
	new file:   src/com/odo/kcl/mobileminer/MinerDataProvider.java
	modified:   src/com/odo/kcl/mobileminer/MinerTables.java
Merge branch 'master' into mostactive

Conflicts:
	res/layout/activity_data.xml
	src/com/odo/kcl/mobileminer/DataActivity.java
	src/com/odo/kcl/mobileminer/MainActivity.java
Network traffic?
 On branch traffic
	modified:   src/com/odo/kcl/mobileminer/CellData.java
	modified:   src/com/odo/kcl/mobileminer/MinerData.java
	modified:   src/com/odo/kcl/mobileminer/MinerService.java
	modified:   src/com/odo/kcl/mobileminer/MinerTables.java
	modified:   src/com/odo/kcl/mobileminer/NotificationService.java
	new file:   src/com/odo/kcl/mobileminer/TrafficWatcher.java
build.gradle file for Android studio.
	new file:   MobileMiner.iml
	new file:   MobileMiner/MobileMiner-MobileMiner.iml
	new file:   build.gradle
	new file:   gradlew
	new file:   gradlew.bat
	new file:   settings.gradle
	modified:   src/com/odo/kcl/mobileminer/MainActivity.java
	modified:   src/com/odo/kcl/mobileminer/MinerService.java
Playing musical pacakages...
 On branch gradle
	modified:   AndroidManifest.xml
	modified:   res/layout/activity_data.xml
	new file:   src/uk/ac/kcl/odo/mobileminer/ActiveAppFragment.java
	new file:   src/uk/ac/kcl/odo/mobileminer/CellLocationGetter.java
	new file:   src/uk/ac/kcl/odo/mobileminer/CountedCell.java
	new file:   src/uk/ac/kcl/odo/mobileminer/DataActivity.java
	new file:   src/uk/ac/kcl/odo/mobileminer/MainActivity.java
	new file:   src/uk/ac/kcl/odo/mobileminer/MapActivity.java
	new file:   src/uk/ac/kcl/odo/mobileminer/MinerLocation.java
	new file:   src/uk/ac/kcl/odo/mobileminer/OpenBmapCellRequest.java
	new file:   src/uk/ac/kcl/odo/mobileminer/SocketAdapter.java
	new file:   src/uk/ac/kcl/odo/mobileminer/ckan/CkanUidGetter.java
	new file:   src/uk/ac/kcl/odo/mobileminer/ckan/CkanUidRequest.java
	new file:   src/uk/ac/kcl/odo/mobileminer/ckan/CkanUpdater.java
	new file:   src/uk/ac/kcl/odo/mobileminer/ckan/CkanUrlGetter.java
	new file:   src/uk/ac/kcl/odo/mobileminer/ckan/CkanUrlRequest.java
	new file:   src/uk/ac/kcl/odo/mobileminer/data/CellData.java
	new file:   src/uk/ac/kcl/odo/mobileminer/data/MinerData.java
	new file:   src/uk/ac/kcl/odo/mobileminer/data/MinerDataProvider.java
	new file:   src/uk/ac/kcl/odo/mobileminer/data/MinerTables.java
	new file:   src/uk/ac/kcl/odo/mobileminer/miner/MinerService.java
	new file:   src/uk/ac/kcl/odo/mobileminer/miner/NotificationService.java
	new file:   src/uk/ac/kcl/odo/mobileminer/miner/ProcSocketSet.java
	new file:   src/uk/ac/kcl/odo/mobileminer/miner/TrafficWatcher.java
Done with moving the furniture.
 On branch gradle
	modified:   AndroidManifest.xml
	modified:   res/layout/activity_data.xml
	new file:   src/uk/ac/kcl/odo/mobileminer/activities/DataActivity.java
	new file:   src/uk/ac/kcl/odo/mobileminer/activities/MainActivity.java
	new file:   src/uk/ac/kcl/odo/mobileminer/activities/MapActivity.java
	new file:   src/uk/ac/kcl/odo/mobileminer/activities/adapters/SocketAdapter.java
	new file:   src/uk/ac/kcl/odo/mobileminer/activities/fragments/ActiveAppFragment.java
	new file:   src/uk/ac/kcl/odo/mobileminer/cells/CellLocationGetter.java
	new file:   src/uk/ac/kcl/odo/mobileminer/cells/CountedCell.java
	new file:   src/uk/ac/kcl/odo/mobileminer/cells/MinerLocation.java
	new file:   src/uk/ac/kcl/odo/mobileminer/cells/OpenBmapCellRequest.java
	modified:   src/uk/ac/kcl/odo/mobileminer/data/MinerData.java
	modified:   src/uk/ac/kcl/odo/mobileminer/miner/MinerService.java
It's alive...
 On branch alt-gradle
	modified:   AndroidManifest.xml
	new file:   app/src/main/java/com/odo/kcl/mobileminer/activities/DataActivity.java
	new file:   app/src/main/java/com/odo/kcl/mobileminer/util/ODOUtil.java
	new file:   gen/uk/ac/kcl/odo/mobileminer/BuildConfig.java
	new file:   gen/uk/ac/kcl/odo/mobileminer/R.java
	modified:   src/uk/ac/kcl/odo/mobileminer/activities/DataActivity.java
	modified:   src/uk/ac/kcl/odo/mobileminer/activities/MainActivity.java
	modified:   src/uk/ac/kcl/odo/mobileminer/activities/MapActivity.java
	modified:   src/uk/ac/kcl/odo/mobileminer/activities/adapters/SocketAdapter.java
	modified:   src/uk/ac/kcl/odo/mobileminer/data/CellData.java
	modified:   src/uk/ac/kcl/odo/mobileminer/data/MinerDataProvider.java
	modified:   src/uk/ac/kcl/odo/mobileminer/miner/MinerService.java
	modified:   MobileMiner/MobileMiner-MobileMiner.iml
	modified:   MobileMiner.iml
Bit of a tidy...
 On branch alt-master
	deleted:    MobileMiner.apk
	deleted:    app/src/main/java/com/odo/kcl/mobileminer/activities/DataActivity.java
	deleted:    app/src/main/java/com/odo/kcl/mobileminer/util/ODOUtil.java
	deleted:    release/MobileMiner.apk