Merge pull request #5 from renshan/develop

Merge from base
review five files in cocos2d/core/sprites folder
Merge pull request #97 from ZhouJ-sh/develop

review five files in cocos2d/core/sprites folder
Merge pull request #96 from Yangtb/develop

review tileMap
review
update
Merge pull request #98 from Yangtb/develop

review CCTMXTiledMap.js
Merge branch 'develop' of https://github.com/Yangtb/cocos2d-html5 into develop

Conflicts:
	cocos2d/menus/CCMenu.js
update CCMenu.js