review

reviewed the node-grid and paralllax files.
Merge branch 'develop' of https://github.com/pascallin/cocos2d-html5 into develop

Conflicts:
	cocos2d/node-grid/CCNodeGrid.js
	cocos2d/parallax/CCParallaxNode.js