commit
try this
Merge branch 'master' of https://github.com/iMorozov/brain

Conflicts:
	admin/item_add.php
	application/controllers/controller_admin.php
	application/lang/ru_RU/ru_RU.php