build path
Merge commit 'fe52159a5a99b712fa60b08e2f3faa689fc2d94e'

Conflicts:
	iOS/VBEngine-cocos2dx.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/VBEngine-cocos2dxTests.xcscheme
	iOS/VBEngine-cocos2dx.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
-
Merge branch 'master' of https://github.com/devmario/VBEngine-cocos2dx

Conflicts:
	VBEngine
	cocos2d-x