Merge branch 'hotfix-2.0.1' into production
Merge branch 'release-2.0.2' into production
Merge branch 'release-2.1.0' into production
Merge branch 'release-2.1.1' into production
Изменено объявление о семинаре
release-2.1.2
Merge branch 'hotfix-2.1.2'

Conflicts:
	bower.json
	package.json