Many changes about admin options
Merge branch 'master' of github.com:DenQ/ballonchiki.dev

Conflicts:
	products_1.xml
	protected/views/layouts/admin.php