tp #547
quick fixes tp 547 implementation bug
Merge pull request #126 from kobotoolbox/tp573

Tp573
tp #547
quick fixes tp 547 implementation bug
merge tp547 into master
Merge pull request #127 from kobotoolbox/tp547

Tp547
Merge branch 'master' into skip-logic-tests