update
Merge branch 'master' of https://github.com/vegligi/chickenWingsApps-001

Conflicts:
	Classes/AppDelegate.cpp
	Classes/GameScene.cpp
	Classes/GameScene.h
	Classes/HomeScene.cpp