Added NPE protection.
Allowed ascii datasets to be axes.
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git