Merge branch 'master' of https://github.com/goper/goperblog.loc

Conflicts:
	protected/runtime/application.log
Merge branch 'master' of https://github.com/goper/goperblog.loc

Conflicts:
	protected/runtime/application.log