andoird project
Merge branch 'cocos2dx-android' of github.com:blingstorm/cocos2d-x into cocos2dx-android