menu nóg chiller gepist
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/res/crunch/drawable-xxhdpi/logo.png