NewOption
Merge branch 'master' of https://github.com/krajj7/pikater

Conflicts:
	src/org/pikater/core/ontology/subtrees/metadata/NewDataset.java