SAKIII-4682 Added list overview of available collections
SAKIII-4682 Add in the rest of the displays
SAKIII-4682 Add transparent icons, improvements to positioning
Merge remote-tracking branch 'origin/master' into SAKIII-4682
SAKIII-4724 - Adding the content authoring widget
SAKIII-4724 - Column management
SAKIII-4682 Implement the inserter functionality, adjust infinite scroll plugin to allow for specification of scrollcontainer
Merge branch 'master' into SAKIII-4724

* master: (30 commits)
  SAKIII-4743 - Fix test failures in Clean JS Test
  SAKIII-4674 - Show tags on the my memberships page
  SAKIII-4721 - Dropdowns in heading are in the wrong place when title of world is too long
  SAKIII-4691 - Adding page to SakaiDoc displays incorrect message stating another user is using the document
  SAKIII-4763 - add requireJS path to build.js
  SAKIII-4763 fix release build
  SAKIII-4757 Broader check implemented
  SAKIII-4757 Ignore empty object in participants results
  SAKIII-4751 - Add default path for underscore
  NOJIRA - Fixing underscore regression
  SAKIII-3823 Removing deprecated showSakai2 property from config files. This used to enable the search sakai 2 menu on the top navigation, before it was moved.
  SAKIII-4720 - Fix scrollbars on content in Safari
  SAKIII-4721 - limit width of faceted dropdown
  NOJIRA - Fixing helloworld widget
  SAKIII-4714 - Make run all tests working again
  SAKIII-4711 - remove explicit redirect pages &
  SAKIII-4714 - Don't add QUnit twice
  SAKIII-3643 Adding jquery validation rules for maxlength on the title and suggested url fields to 255
  SAKIII-3643 Adding maxlength of 255 to group title and url path (which is based off the title).
  SAKIII-4715 - Make Underscore 1.2.3 work nicely with OAE
  ...
SAKIII-4724 - Core framework
SAKIII-4774 Cells don't always show full height in Chrome, SAKIII-4775 Give rows a minimum height of 25px
Merge branch 'SAKIII-4682' into SAKIII-4776
SAKIII-4724 - Latest changes
Merge remote-tracking branch 'nicolaas/SAKIII-4724' into SAKIII-4776
Merge inserter and fix conflicts
SAKIII-4776 Allow dragging of content from the inserter into the page
SAKIII-4724 - More core framework
SAKIII-4777 Allow dragging of external content into page
SAKIII-4724 - Allow adding of new elements
Merge branch 'SAKIII-4774' of git://github.com/bp323/3akai-ux into contentauthoring

* 'SAKIII-4774' of git://github.com/bp323/3akai-ux:
  SAKIII-4774 Cells don't always show full height in Chrome, SAKIII-4775 Give rows a minimum height of 25px

Conflicts:
	devwidgets/contentauthoring/contentauthoring.html
	devwidgets/contentauthoring/css/contentauthoring.css
	devwidgets/contentauthoring/javascript/contentauthoring.js
Merge branch 'SAKIII-4776' of git://github.com/bp323/3akai-ux into contentauthoring

* 'SAKIII-4776' of git://github.com/bp323/3akai-ux:
  SAKIII-4776 Allow dragging of content from the inserter into the page
  SAKIII-4682 Implement the inserter functionality, adjust infinite scroll plugin to allow for specification of scrollcontainer
  SAKIII-4682 Add transparent icons, improvements to positioning
  SAKIII-4682 Add in the rest of the displays
  SAKIII-4682 Added list overview of available collections
  SAKIII-4682 Set up inserter widget and create the 'no collections' display

Conflicts:
	devwidgets/contentauthoring/contentauthoring.html
	devwidgets/contentauthoring/css/contentauthoring.css