bla
Merge branch 'master' of https://github.com/kkbest/Linz.pflueckt.git
added onBackPressed
merged
Merge branch 'master' of https://github.com/kkbest/Linz.pflueckt.git

Conflicts:
	Obstbaumapp/src/jku/itprojekt/obstbaumapp/MainActivity.java