Merge branch 'hotfix-2.1.2' into production
Изменен текст семинара
release-2.1.3
Merge branch 'hotfix-2.1.3'

Conflicts:
	bower.json
	package.json
Merge branch 'master' into new_relations