System page navigation improvements, not finished
Merge branch 'develop' into ux
Updating the Settings pages
Merge branch 'develop' into ux
Updated the settings pages UX
Update oc- icons to match font autumn
Minor tidy up to framework.js