Merge branch 'dev'
minify scripts and css
добавил ужатие файлов перед деполем с коммитом в ветку master
fix
minify scripts and css
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
minify scripts and css
Merge branch 'dev'

Conflicts:
	labs/static/css/labs.css
	labs/static/js/labs.js
fix fabfile
minify scripts and css