google integration
Merge branch 'master' of http://github.com/euniciaruiz/activityTracker

Conflicts:
	activityTracker/platforms/android/assets/www/cordova_plugins.js
	activityTracker/platforms/android/assets/www/index.html
google integration