tilemap supports XML layer format
the latest develop code merged
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into tilemap_plain_xml_format_support
added _currentTileIndex member to TMXLayerInfo
removed extra _currentTileIndex
Merge branch 'tilemap_plain_xml_format_support' of https://github.com/simpliplant/cocos2d-x into tilemap_plain_xml_format_support and add extra control to parse the tmx file for load the xml format tiles.
issue #2533:add ATITC compressed texture support

soft decode test in Win32, ios, Mac. device decode test in HTC G14
Adreno 220 GPU.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Atitc_decode
issue #2533: updating some GL macro definition
issue #2533: resolve some conflicts
closed #2533:fix some wrong indent
closed #2533:updating new file copyrights
issue #2517: add the LocalVarToAuto.py script
Merge pull request #3428 from godyZ/Atitc_decode

issue #2533:add ATITC comressed texture (*.ktx file) support
closed #2517: Use LocalVarToAuto.py to change Samples src file
issue #2517: Restore TestCpp proj.android that edited by mistake.
updata: [cocos2d's code style] add space before backslash and return before else if
Merge pull request #3429 from godyZ/Atitc_decode

issue 2533: [cocos2d's code style] add space before backslash and return bef...
issue #2525:add iterator for Array and make Array can be used in range-based loop
Keep TravisCI happy : build Android TestCpp for ARM architecture only.