登录页面后台管理员
Merge branch 'master' of https://github.com/RongERong/sitecode

Conflicts:
	fuel/app/config/routes.php

Signed-off-by: shaoqi <shaoqisq123@gmail.com>