Atlases changes
Merge branch 'master' of https://github.com/bookac/game

Conflicts:
	Scenes/Game.unity