KF-88 Integration Test
Merge branch 'master' into kf88
Merge pull request #6 from kobotoolbox/kf88

KF-88 Integration Test