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

Conflicts:
	activityTracker/platforms/android/CordovaLib/bin/activitytracker-cordovalib.jar
	activityTracker/platforms/android/assets/www/cordova_plugins.js
	activityTracker/platforms/android/assets/www/index.html
	activityTracker/platforms/android/bin/ActivityTracker.apk
	activityTracker/platforms/android/bin/classes.dex
	activityTracker/platforms/android/bin/resources.ap_
	activityTracker/platforms/android/res/xml/config.xml
	activityTracker/plugins/android.json