closes tp #553
Merge pull request #138 from kobotoolbox/tp553

closes tp #553
Merge pull request #140 from kobotoolbox/tp586

#586 - split builder screens into two urls
Merge pull request #139 from kobotoolbox/tp612

Tp612
Merge branch 'master' into tp612
#612 - fix for new form not saving, fixed button links and visibilities