Merge pull request #4211 from ricardoquesada/coding_ii

More fixes to CODING STYLE
removes cocos2d-x from title since the image is already there
Merge pull request #4212 from ricardoquesada/coding_iii

removes cocos2d-x from title since the image is already there