basejs
Merge remote-tracking branch 'doudou/master' into dev_ztf1

Conflicts:
	protected/runtime/application.log
some fix
add weibo com