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

Conflicts:
	blog/protected/runtime/application.log