Merge pull request #1132 from modmedia/develop

Fixing setup screen
Merge pull request #1133 from modmedia/develop

Dynamic var tweaks
Merge pull request #1134 from modmedia/develop

Adding back 6.0 css files for backwards compatibility
Search engine into dorp down site selection
demo exclusion
links was not activated into the items
comments clean up
CKEditor updates: codemirror, add sourcedialog if admin/superuser
Merge pull request #1137 from stevewithington/develop

CKEditor updates: codemirror, add sourcedialog if admin/superuser
refresh to upstream
refresh to upstream
Merge pull request #1136 from adeleusiere/develop

Beautiful!
bug fix: inline edit button display issue
Merge pull request #1138 from stevewithington/develop

bug fix: inline edit button display issue
bug fix: quick edit [m] tab display issue
bug fix: QuickEdit toolbar button display issues
bug fix: merge conflict code in admin.min.js removed
display message when home page carousel feed does not exist
bug fix: ckeditor button styles for inline editing only
Merge pull request #1139 from stevewithington/develop

bug fix: quick edit [m] tab display issue