Merge branch 'master' into staging
Merge branch 'staging' of github.com:kcl-ddh/digipal into staging
Fixed bug unticked setting boxes_on-click
re-fixed bug setting boxes_on_click
Found and fixes another issue concerning last commits