merge
Merge branch 'master' of
https://github.com/Quasineation/cabinwebproject.git

Conflicts:
	src/no/uib/info216/cabinwebproject/semantic/DatasetQuery.java