Merge branch 'staging'
Updated nav-spaces to point to the right directory
Merge branch 'studyrooms' into staging