fixed merge conflicts from newform branch
merged from postcodeform and newform
.
.
changes to presentation
resolved merge