Layout pause
Merge branch 'master' of https://github.com/Loulou54/Colibri

Conflicts:
	gen/com/game/colibri/R.java