For fix buildingWindow
Unit window finished
Countdown XX sec during a battle.
Merge branch 'master' into v0.2.2

Conflicts:
	proj.ios_mac/Parallelformosa_Cocos2dx.xcodeproj/project.xcworkspace/xcuserdata/Vodalok.xcuserdatad/UserInterfaceState.xcuserstate