Merge pull request #25 from SmartCat/gaf-4-merge-gaf-3

Merge fixes to GAF4
- minor changes
- added not merged fixes
Merge branch 'gaf-4-merge-gaf-3' of https://github.com/SmartCat/Cocos2dxGAFPlayer into gaf_4_develop