project.properties
Merge branch 'gamedev' of https://github.com/catyguan/cocos2d-x into gamedev
CCFileSystemProtocol.cpp
Merge branch 'gamedev' of https://github.com/catyguan/cocos2d-x into gamedev
android build pass