Fixed Geofences as a Service Binded to the Original Activity
Merge branch 'master' of https://github.com/aehernandez/Lifemeter

Conflicts:
	.idea/workspace.xml
	project.properties