Added pushup activity
fixed nullpointer
fixed proximity sensor always counting
extra commit
GoogleMap Test
Merge remote-tracking branch 'origin/master' into sportaktivity

Conflicts:
	comfit/AndroidManifest.xml
	comfit/res/values/strings.xml
	comfit/src/de/comfit/MainActivity.java