new
dsfsfsd
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	protected/views/cpanel/categories/_form.php
	protected/views/cpanel/objects/view/_form.php