abstracting entryjob and intake classes
Merge branch 'master' of github.com:guardianproject/InformaCam
merging
updating to latest ODK parser commit.
modified zipping utility.
j3m data directive modified for zipped data as per https://dev.guardianproject.info/issues/2792
minor fixes
Merge pull request #1 from guardianproject/harlo_task_2792

Please try this out: Harlo task 2792