pub/userinfo
pubinfo
admin modify
Merge branch 'master' of https://github.com/DingYong4223/syscoin

Conflicts:
	bieggs/Public/Images/ad/ad_tit_current.gif
	bieggs/Public/Images/ad/tab_current.gif
	bieggs/Public/Images/pub/grows.png
	bieggs/Public/Images/public/tab_current.gif