Håper dette går fint
Merge branch 'master' of https://github.com/martejs/TestMaster

Conflicts:
	IndexMaster/src/luceneindexer/search/SearchDBpedia.java