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

Conflicts:
	activityTracker/platforms/android/.classpath
	activityTracker/platforms/android/CordovaLib/.classpath
	activityTracker/platforms/android/CordovaLib/bin/activitytracker-cordovalib.jar
add table to Activity Tracker database