AI-616 Refactor OdkTypeAdapter interface
Merge branch 'version4' of github.com:bedatadriven/activityinfo into version4