fixed object and datatype labels and templates
Merge branch 'master' of https://github.com/linked-statistics/disco-spec