Refactored onCreate and onResume of MainActivity
Merge branch 'refactoring' into develop

Conflicts:
	v2/src/uni/leipzig/bm2/activities/MainActivity.java
big refactoring of MainActivity