Update to the new structure.
Fix path.
Merge branch 'develop' of github.com:IgorMats/cocos2d-over-road into develop

Conflicts:
	frameworks
	project.json