work around popup bakery
Merge branch 'master' of https://github.com/gregorytkach/com.cowplay.soldiers-wars

Conflicts:
	.idea/workspace.xml
	src/soldiers/controllers/popups/houses/bakery/ControlPopupBakery.as
	src/soldiers/controllers/scenes/village/views/housesV/ControlHouseViewV.as