Signed-off-by: MartinKingKong <skafield91@web.de>
Merge branch 'master' of https://github.com/RaphaelaHeil/MobileComputing.git

Conflicts:
	bin/classes/org/getrunning/R$string.class
	bin/classes/org/getrunning/R$style.class
	gen/org/getrunning/R.java
	res/values/strings.xml
Signed-off-by: MartinKingKong <skafield91@web.de>