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

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

Conflicts:
	activityTracker/platforms/android/assets/www/index.html
resolved conflicts