noch mehr drawer zeug
Merge branch 'master' of https://github.com/Blumss/ArmyOfFriends

Conflicts:
	app/src/main/res/layout/activity_base.xml