Just test.
Just test.
just test modify.
just test modify.
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myMaster
Merge branch 'myMaster' of https://github.com/shujunqiao/cocostudioSampleGmae into myMaster
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myMaster
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myMaster
add tiled map.
add tiled map.
Merge pull request #11 from shujunqiao/myMaster

My master
fix loading bug
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae

Conflicts:
	cocos2d-html5/.idea/workspace.xml
ignore .idea file