Удалил dist
Merge branch 'master' of github.com:yarikus/ct-settings

Conflicts:
	flatify/dist/index.html
	flatify/dist/scripts/app.js
	flatify/dist/scripts/ui.js
	flatify/dist/styles/main.css
	flatify/dist/styles/vendors/bootstrap-colorpicker.css.css