Signed-off-by: Zejun Lei <847724816@qq.com>
Signed-off-by: Zejun Lei <847724816@qq.com>
Merge branch 'lujie' into julian520

Conflicts:
	protected/components/Controller.php
	protected/config/main.php

Signed-off-by: Zejun Lei <847724816@qq.com>
Merge branch 'Julian520' into cangZhou