updating main header file + android nakefile to standard
Merge branch 'master' of github.com:soomla/cocos2dx-profile
Merge branch 'master' into cocos2dx-v2