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
bug fix: folder & rating display issues
minor display issue
Merge pull request #1140 from stevewithington/develop

bug fix: folder & rating display issues
Adding indexes for comments
Improving 404 lookup logic
Fixing issue with transactions
bug fix: issue #1411 site list
Merge pull request #1142 from stevewithington/develop

bug fix: issue #1411 site list
Updating site selector
bug fix: jquery ui css pathing to images
Merge pull request #1143 from stevewithington/develop

bug fix: jquery ui css pathing to images