Issue #5981: Fix templates issue
Merge branch 'sync3.3' of https://github.com/pandamicro/cocos2d-js into sync3.3

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