AI-616 Remove unused private method from FormResource
AI-616 Add initial implementation of skip logic to ODK export
Merge branch 'version4' of github.com:bedatadriven/activityinfo into version4