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

Conflicts:
	platforms/android/bin/classes/com/project/activityTracker/R$string.class
	platforms/android/bin/classes/com/project/activityTracker/R$style.class
	platforms/android/bin/classes/com/project/activityTracker/R$xml.class
resolve conflicts