Commit for commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	locate/ru/templates/mainfooter_template.html