little merge
Merge origin/master

Conflicts:
	application/config/routes.php
	application/language/en/inter_lang.php
	js/components/admin/core/core.js
	js/components/admin/mini_block/views/23.tmpl
	js/components/admin/mini_block/views/8.tmpl
	js/components/admin/static/static.js