MINOR: SSF-106 Include cms gridfield javascript hooks
MINOR Merge errors
MINOR Reinstated getting current record ID from session in AssetAdmin in order to allow routing to GridFieldPopupForms detail views (admin/assets/show/99 vs admin/assets/EditForm/field/...)
MINOR Linking breadcrumbs to root node via AssetAdmin->Breadcrumbs()
Merge branch 'master' into integration
MINOR Removed duplicate reset CSS from cms
MINOR Consolidated AssetAdmin->FilterForm() button styling and labels with CMSMain
MINOR Moved CMSMain.GridField.js logic into LeftAndMain.js (applies to all CMS interfaces), fixed event bugs with GridField overloading in AssetAdmin.js
MINOR Removed duplicate AssetAdmin.scss file
MINOR Removed obnoxious message about tree filtering success (which now became visible as we fixed the statusMessage() system)
BUGFIX Fixed CMSFileAddController upload in custom folders
ENHANCEMENT #6828 (Trac): Add a canonical link tag to the meta tags of Virtual Pages

See http://support.google.com/webmasters/bin/answer.py?hl=en&answer=139394
ENHANCEMENT Refactored AssetAdmin to use SearchContext for filtering records, rather than relying on GridFieldFilter - less coupling to one view (we also have gallery and tree views), and more flexible filtering on columns/criteria which are not present in GridField
MINOR Fixed breadcrumbs for CMSSettingsController
Merge pull request #63 from oddnoc/6828-canonical-tag-virtual-page

ENHANCEMENT #6828 — Add a canonical link tag to the meta tags of Virtual Pages
ENHANCEMENT Using chosen.js selection instead of a TreeDropdownField to select groups in SiteConfig->getCMSFields() and SiteTree->getCMSFields()
BUGFIX Restored old permission code model, broken due to new controller structure. Introduced LeftAndMain::$required_permission_codes as a way to control permissions independently of subclasses, and "cluster" multiple classes under a single code.
Merge pull request #62 from silverstripe-scienceninjas/master

BUGFIX: SiteTree#getCMSFields would only calculate local variable $linkedPages if ID was valid, but would then refer to that variable regardless
BUGFIX: Dont need (and cant call) iteratorProperties calls as workaround any more
Merge pull request #64 from silverstripe-scienceninjas/feature/ssviewer-enhancements

BUGFIX: Dont need (and cant call) iteratorProperties calls as workaround...