reset vom startscreen
refresh nach activity
Merge branch 'master' of https://github.com/BrandiATMuhkuh/prore2012gp3

Conflicts:
	android/src/at/ac/tuwien/sportmate/MainActivity.java