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

Conflicts:
	platforms/android/CordovaLib/bin/activitytracker-cordovalib.jar
	platforms/android/bin/classes/com/project/db/DatabaseHelper.class