config android_mk_generator
replace os.path.samefile

os.path.samefile not work at windows.
add some options

Usage: android_mk_generator.py [options]

Options:
-h, --help            show this help message and exit
-c CONFIG, --config=CONFIG
config file path.
-r ROOTPATH, --rootpath=ROOTPATH
class root path for mkfile, pathes, exclude.
Colors are now compare- and explicit convertible
There are not directory entry in some case.So we need to test whether the file directory exists when uncompressing file entry, if does not exist then create directory
fixed cocostudio action can not looping
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
issue #2770: fix some warning
Fix a bug:we can use 'Custom Class' in CocosBuilder, and assign custom properties to it, but when you create some nodes with the same custom_class , and they have different custom properties, as they are same class and the share one Loader, so in the loader _customProperties will be wrong.
So, I dropped some lines to clear _customProperties before handle an new node.
issue #2770: fix some warning
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings
merge from develop
Adds markdown comments in the doxstrings

Since Doxygen 1.8.0 (we are already using it), it is possible to
add markdown comments in the doxygen strings.

This will make our comments easier to read.

This patch  only adds markdown to CCNode.h as a test.

If you like, I'll keep adding markdown comments as I see them.
Please, encourage the rest of the team to do the same.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings
fix direct delete touch object without use release crash bug;
use Configuration::getInstance()->supportsShareableVAO() in place of CC_TEXTURE_ATLAS_USE_VAO;
fix GL_EXT_discard_framebuffer always disable in EAGLView.mm;
fix GL_EXT_discard_framebuffer always disable in EAGLView.mm (fix compile fail on early iOS SDK 4.0);
add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed in GLProgram class.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into fix_touch_retain

Conflicts:
	cocos2dx/platform/CCEGLViewProtocol.cpp