Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Client

Conflicts:
	nEVERrEST/app/src/main/java/de/ferienakademie/neverrest/view/MainMenuActivity.java
	nEVERrEST/app/src/main/res/layout/activity_main_menu.xml
activity
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Client

Conflicts:
	nEVERrEST/app/src/main/java/de/ferienakademie/neverrest/view/MainMenuActivity.java
	nEVERrEST/app/src/main/res/layout/activity_main_menu.xml
text
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Client

Conflicts:
	nEVERrEST/app/src/main/java/de/ferienakademie/neverrest/view/MainMenuActivity.java
	nEVERrEST/app/src/main/res/layout/activity_main_menu.xml
text
Merge remote-tracking branch 'origin/master'

Conflicts:
	nEVERrEST/app/src/main/java/de/ferienakademie/neverrest/view/MainMenuActivity.java