Merged dev work to master
merging dev
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master' of github.com:SCAS/locum-polaris-41
Merge branch 'master' into dev
Added Hoopla-fix script