some fix
Merge remote-tracking branch 'doudou/dev_zxp1'
add urls
add pub
basejs
Merge remote-tracking branch 'doudou/master' into dev_ztf1

Conflicts:
	protected/runtime/application.log
some fix
add weibo com
添加微博数据
test
userindex commit
commit userindex controller images
add comment
emotion
add comment
userindex页面
Merge remote-tracking branch 'origin/master' into dev_zxp1

Conflicts:
	protected/components/Controller.php
	protected/runtime/application.log