引导页面完成80%，修复未登陆进入首页时的错误提示w
Merge branch 'master' of github.com:vtmer/bookshelf

Conflicts:
	website/application/controllers/home.php