show activity code
Merge branch 'master' of https://github.com/euniciaruiz/activityTracker

Conflicts:
	platforms/android/CordovaLib/bin/activitytracker-cordovalib.jar
	platforms/android/bin/ActivityTracker.apk
	platforms/android/bin/classes.dex
	platforms/android/bin/classes/com/project/db/DatabaseHelper.class
	platforms/android/bin/resources.ap_
	platforms/android/src/com/project/db/DatabaseHelper.java