Merge branch 'master' of https://github.com/lz1988/yiiblog

Conflicts:
	web/protected/adminweb/runtime/application.log
Merge branch 'master' of https://github.com/lz1988/yiiblog