- merging #2
- merged ignore list
Merge branch 'gaf-4-merge-gaf-3' of https://github.com/SmartCat/Cocos2dxGAFPlayer into gaf-4-merge-gaf-3