final code cleanup before total rewrite
Merge branch 'master' of https://github.com/MartijnR/enketo into enketo.org_production