resolving conflict for cordova package
Merge branch 'master' of https://github.com/euniciaruiz/activityTracker

Conflicts:
	activityTracker/platforms/android/CordovaLib/bin/activitytracker-cordovalib.jar
resolving conflicts
Merge branch 'master' of https://github.com/euniciaruiz/activityTracker

Conflicts:
	activityTracker/platforms/android/CordovaLib/bin/activitytracker-cordovalib.jar
	activityTracker/platforms/android/assets/www/index.html
	activityTracker/platforms/android/bin/ActivityTracker.apk
	activityTracker/platforms/android/bin/resources.ap_
removed conflicts
Merge branch 'master' of https://github.com/euniciaruiz/activityTracker

Conflicts:
	activityTracker/platforms/android/bin/ActivityTracker.apk
	activityTracker/platforms/android/bin/resources.ap_
removed conflicts.
Merge branch 'master' of https://github.com/euniciaruiz/activityTracker

Conflicts:
	activityTracker/platforms/android/assets/www/index.html
	activityTracker/platforms/android/assets/www/index.html~
edit for conflicts
Merge branch 'master' of https://github.com/euniciaruiz/activityTracker

Conflicts:
	activityTracker/platforms/android/CordovaLib/bin/activitytracker-cordovalib.jar
	activityTracker/platforms/android/assets/www/index.html
edit view functionality