Partial changes to align with Smap Server
Merge branch 'master' of https://github.com/nap2000/enketo.git