1
Merge branch 'master' of github.com:johnnyeven/bacterial2-cocos2dx

Conflicts:
	code/Classes/MainScene.cpp
	code/Classes/MainScene.h