Fixed issue with require order
Updated sidebar view
Updated sideBarItems and added globalMenu to Origin
Updated to include velocity and sidebarItemViews
Updated sidebar
Merge branch 'develop' into issue/#324

* develop:
  fixes #339 - updates to asset manager
  Event order update
  Editor cut functionality - Cut added for articles, blocks, components - Drop zones updated for dragging
  fixes #328 - PUT/POST need reversed in lib/assetmanager.js
  Adding drag and drop functionality to the editor - Drag and drop of articles, blocks and components
  Fixes ABU-163, ABU-160
  Added JQuery UI
  Updated context menu - Removing redundant code - Close context on click
  Updated paste zones and bug fixes for pasting
  fixes #328
  Re-worked the page overview section
  More menu editor styling tweaks
  Added border to menu styling
  Implementation of context menu on menu editor

Conflicts:
	config.js
	frontend/src/core/app/app.js
Adding ability to drag components to change layout
Merge pull request #343 from adaptlearning/drag-layout

Draggable component layouts
Fixed missing ,
Fixes to globalMenu and router

- Added Origin.location
- Router allows only two routes
- Updated clear up of active views for globalMenu
- Fixed outdated code for Origin.currentLocation which is now an object
Fixed router to handle plugin routes
Fixed routes and added project controller
Updated router to allow authentication checks
Updated router and controllers

- dashboard, project and users now have controllers
Switched method around
Updated dashboard and globalMenu events

- Removed testing code too
Merge pull request #344 from adaptlearning/issue/#325

Issue/#325
Added new routing mechanism to assetManagement

Merge branch 'develop' into create-asset

Conflicts:
	config.js
	frontend/src/core/app/app.js
	frontend/src/core/app/router.js
Merge branch 'create-asset' of github.com:adaptlearning/adapt_authoring into create-asset

Conflicts:
	config.js
	frontend/src/core/app/app.js
	frontend/src/core/assetManagement/views/assetCollectionView.js