for xcode5
Merge branch 'master' of https://github.com/citydeer/iSlapping

Conflicts:
	iSlapping/iSlapping/Classes/GameScene.cpp
...