#663
Merge branch 'dev-master'
#663
Merge branch 'dev-master'
Merge branch 'dev-master'

Conflicts:
	helpdesk/i18n/ru/messages.xml
Merge branch 'dev-master'
Merge branch 'dev-master'
Merge branch 'dev-master'
Merge branch 'dev-master'
Merge branch 'dev-master'
Merge branch 'dev-master'
Merge branch 'dev-master'
Merge branch 'dev-master'
Merge branch 'dev-master'
Merge branch 'dev-master'
Merge branch 'dev-master'
Merge branch 'dev-master'
#735
#735