Merge problems
Merge pull request #130 from kobotoolbox/merge-hell

Merge problems