CMS-3690 Responsive App Menu - Less transparency for app menu over application
CMS-3689 Responsive App menu - Fix counter placement
CMS-3676 Responsive App Menu - Prevent jumping text when toggling items in menu
CMS-3677 Responsive App Menu - Mobile version fixes
CMS-3707 Versioning and workspaces - Add support for workspaces in portal

Added workspace and context
CMS-3715 Add context to SiteService

Made SiteService use provided context
CMS-3719 - Add context to AttachmentService

Yes
CMS-3707 Versioning and workspaces - Add support for workspaces in portal

Added workspace to portal domain. Fixed workspace-init, updated test.
CMS-3720 Append workspace to all paths

A bit messy with the 4 arguments method in UriHelper, but Ill let it be for now since its going to be heavy changes in the url-rendering stuff
CMS-3650 LiveEdit - Move logic in Highlighter.ts and Selection.ts into ItemView.ts
CMS-3707 Versioning and workspaces - Add support for workspaces in portal

fixed merge conflicts after major portal changes
Merge pull request #804 from enonic/CMS-3650

CMS-3650 LiveEdit - Move logic in Highlighter.ts and Selection.ts into I...
CMS-3733 Replace ExtJS grid - Make keyboard shortcuts work using KeyBinding

Fixed conflict of the mousetrap and slickgrid.
Updated mousetrap library.
Replaced minified version with an uncompressed.
CMS-3716 Add context to PageService

And so he (I) did
Merge pull request #805 from enonic/CMS-3733

CMS-3733 Replace ExtJS grid - Make keyboard shortcuts work using KeyBind...
CMS-3723 LiveEdit - Broken after refactoring - Moving existing PageComponent to another Region
Disabled logging in Tooltip.hideOtherInstances
CMS-3736 Replace ExtJS grid - Let new and old content grid switch place within same container
Merge branch 'master' into osgi