added modal for creating new layout
Merge pull request #5 from aethawalka/master

added modal for creating new layout
Пофиксил стили для таблиц
Пофиксил лого
edited paths for images
Merge pull request #6 from aethawalka/master

edited paths for images
Удалил 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
Merge pull request #7 from aethawalka/aethawalka-settings-dnd

Aethawalka settings dnd
repaired modal for creating layout
Merge pull request #8 from aethawalka/master

repaired modal for creating layout
Пофиксил верстку
Оптимизация вкладки General
Fixed htmlmin task in Gruntfile
Backup from apex
Merge branch 'master' of github.com:yarikus/ct-settings
Updated Settings.page.html
added namespaces, added server data to available list
Merge branch 'master' of github.com:yarikus/ct-settings into aethawalka-settings-dnd
merge