delete cclog.
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myWork

Conflicts:
	cocos2d-x-2.2.0/projects/Ironman/Classes/GameScenePlayLayer.cpp
	cocos2d-x-2.2.0/projects/Ironman/Classes/Laser.cpp
conflict fixed.
fix map bug.
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myWork
no message
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myWork
Merge pull request #45 from shujunqiao/myWork

My work