登录验证修改
third
Merge branch 'master' of https://github.com/chengshao2014/lampblog

Conflicts:
	404.html
更新index
更改404.html
验证
111
Merge branch 'master' of https://github.com/chengshao2014/lampblog

Conflicts:
	blog/protected/runtime/application.log
123
删除404.bak
后台框架
1212
1