modify play
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js

Conflicts:
	templates/js-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp