Merge pull request #1 from point97/dev

Dev This is a test pull request to merge my changes from dev to master
Merge branch 'dev'
Got a spinner on the side bar so you cannot click broken links now. This uses the directive loadingSurvey directive that should be generalized. Refs #216