less bad bad hack ;)
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/ordonteam/background/BackgroundMazeDrawer.groovy
less bad bad hack ;)