Merge commit '15542008c94b506afb8d1f2e036710dbf7508bf0'

Conflicts:
	mod_ivform/language/ru-RU/ru-RU.mod_ivform.ini
Merge commit '15542008c94b506afb8d1f2e036710dbf7508bf0'

Conflicts:
	mod_ivform/language/ru-RU/ru-RU.mod_ivform.ini
test commit
Merge origin/master

Conflicts:
	.gitignore