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

Conflicts:
	protected/models/Category.php
	protected/modules/admin/controllers/CategoryController.php
	protected/modules/admin/views/category/_form.php
	protected/modules/admin/views/category/admin.php
	protected/modules/admin/views/category/create.php
	protected/modules/admin/views/category/index.php
	protected/modules/admin/views/category/view.php
	protected/runtime/application.log
Merge branch 'master' of https://github.com/goper/goperblog.loc

Conflicts:
	.idea/workspace.xml
	protected/models/Category.php
	protected/modules/admin/controllers/CategoryController.php
	protected/modules/admin/views/category/_form.php
	protected/modules/admin/views/category/admin.php
	protected/modules/admin/views/category/create.php
	protected/modules/admin/views/category/index.php
	protected/modules/admin/views/category/view.php
	protected/runtime/application.log