1
Merge branch 'master' of https://github.com/Vitalii11/slot

Conflicts:
	BaseEngine/src/com/sot/game/models/ButtonsModel.as