UI fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/locale/lang_en.php
	application/locale/lang_ru.php
	application/locale/lang_ua.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/locale/lang_en.php
	application/locale/lang_ru.php
	application/locale/lang_ua.php