fix conflicts
Merge branch 'master' of https://github.com/euniciaruiz/activityTracker

Conflicts:
	activityTracker/platforms/android/assets/www/index.html
	activityTracker/platforms/android/bin/ActivityTracker.apk
	activityTracker/platforms/android/bin/resources.ap_
minify the javascript