merge
Merge branch 'master' of http://github.com/euniciaruiz/ActivityTracker

Conflicts:
	activityTracker/platforms/android/assets/www/index.html
Merge branch 'master' of http://github.com/euniciaruiz/ActivityTracker

Conflicts:
	activityTracker/platforms/android/assets/www/index.html
Merge branch 'master' of http://github.com/euniciaruiz/ActivityTracker
formatting datetime