Navigation Drawer and so on
Merge remote-tracking branch 'origin/master'

Conflicts:
	nEVERrEST/app/src/main/AndroidManifest.xml
	nEVERrEST/app/src/main/java/de/ferienakademie/neverrest/view/MainMenuActivity.java
	nEVERrEST/app/src/main/java/de/ferienakademie/neverrest/view/ProfileActivity.java
	nEVERrEST/app/src/main/res/layout/activity_challenge.xml
	nEVERrEST/app/src/main/res/layout/activity_profile.xml
	nEVERrEST/app/src/main/res/values/strings.xml
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Client

Conflicts:
	nEVERrEST/app/src/main/res/layout/activity_challenge.xml
Master version
Merge remote-tracking branch 'origin/master'

Conflicts:
	nEVERrEST/app/src/main/res/layout/activity_profile.xml
	nEVERrEST/app/src/main/res/values/strings.xml
Wer das zerschießt ist tot!
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Client

Conflicts:
	nEVERrEST/app/src/main/java/de/ferienakademie/neverrest/view/ActiveChallengesActivity.java
	nEVERrEST/app/src/main/java/de/ferienakademie/neverrest/view/ChallengeActivity.java
	nEVERrEST/app/src/main/java/de/ferienakademie/neverrest/view/MainMenuActivity.java
	nEVERrEST/app/src/main/res/layout/activity_challenge.xml