Add a "Study Area" template to the unimelb theme.
Fixup a merge conflict in scss/unimelb.scss.
merge master