Правки
Merge remote-tracking branch 'origin/master'

Conflicts:
	out/app.min.map
	out/style.min.css