AI-623 and AI-624: Show description as hint in ODK form and handle "Country" locationTypes
Merge branch 'release' of github.com:bedatadriven/activityinfo into release