add img
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/jsLibraryMappings.xml
	cocos2d/server/server.js
成品
删除无用文件