Signed-off-by: Radchenko Marina <mar_radch@mail.ru>
Merge branch 'master' of https://github.com/stemsc/stem_atn.git

Conflicts:
	application/modules/user/views/scripts/index/search-by-code-brand.phtml