armv7
Merge branch 'master' of https://github.com/devmario/VBEngine-cocos2dx

Conflicts:
	VBEngine