pull
pull Merge branch 'master' of https://github.com/bhahm/PingU-Android

Conflicts:
	Android Project Workspace/project.properties
	Android Project Workspace/res/layout/activity_maps_and__pinging.xml
	Android Project Workspace/res/values/strings.xml