注册
Merge branch 'master' of https://github.com/forecho/bizui

Conflicts:
	protected/runtime/application.log
	protected/views/site/index.php