Merge branch 'dashboard_sections'
Merge branch 'master' of https://github.com/HighgateCross/Makeup