Comment out permission code
Fix questionnaire optimisation
Fix questionnaire saving
Fix unit tests
Merge branch 'develop' of github.com:Ecodev/gims into develop