ja
Merge remote-tracking branch 'origin/master'

Conflicts:
	CocktailMixxer/res/layout/activity_newcocktail.xml
Für Jakob den Stricher,
newcocktail