PLD: fix order of fields
PLD: line length
PLD: rollback bad transaction
Merge branch 'pld/add-json-column' of github.com:onaio/onadata into pld/add-json-column