Next Activities
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/activity_player_home.xml
	src/de/hsb/kss/mc_schnitzeljagd/ui/PlayerHomeActivity.java