gameplay
Merge branch 'master' of https://github.com/ni-cc/coffeebreak

Conflicts:
	coffeebreak.pro
Merge branch 'master' of https://github.com/ni-cc/coffeebreak
trunk
Merge branch 'master' of https://github.com/ni-cc/coffeebreak