1
Merge branch 'master' of https://github.com/smallkot/demo

Conflicts:
	demo/demo/Classes/HelloWorldScene.cpp
	demo/demo/Classes/HelloWorldScene.h