re-name nxdata so works with NCD export to ascii
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git