20:56
Merge branch 'master' of https://github.com/chengshao2014/lampblog

Conflicts:
	blog/protected/modules/blogadmin/controllers/LoginController.php
	blog/protected/modules/blogadmin/views/login/top.php
	blog/protected/runtime/application.log