conditional trackjs inclusion
livereload displayed in sandbox only if specified
Revert "#1308 - Expanded question can't be moved easily to new position"
Merge pull request #406 from kobotoolbox/revert-404-row-movement

Breaking master; ui.helper is sometimes null
Revert "#1090 - Settings and choices should close when dragging a question"
Merge pull request #407 from kobotoolbox/revert-398-row-movement

causing quirky behavior on master
undoing selector which broke option text selection tp #1292
fix for centering of add form dropdown, #1158
fix for activation pages #1230 + added link to logo on these pages
Merge pull request #411 from kobotoolbox/ui-issue-1158

minor ui fix for centering Add Form dropdown #1158
Merge pull request #412 from kobotoolbox/ui-fixes-registration

UI registration/activation page fix #1230
Merge pull request #410 from kobotoolbox/tp1292

undoing selector which broke option text selection tp #1292
Merge pull request #399 from kobotoolbox/conditional-trackjs

conditional trackjs inclusion
merging and fixing conflict