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

Conflicts:
	protected/data/blog.db
	protected/modules/admin/views/layouts/main.php
	protected/runtime/application.log