Add metadata now working and bit better looking.
Framework in place for handling different domains.
Minor tidying
Merge remote-tracking branch 'origin/eudat-311' into eudat-311