Merge branch 'edge' into sfu-develop
fix typos in folder name and button id
Merge pull request #187 from grahamb/adhoc-button

Fix two problems with adhoc group button
workaround for dashboard sidebar not loading
Merge pull request #188 from sfu/fix_dasbhoard

workaround for dashboard sidebar not loading
Merge branch 'sfu-develop' into edge