Hmm
Merge branch 'master' of github.com:martejs/TestMaster

Conflicts:
	IndexMaster/src/luceneindexer/javascript/Servlet.java
	IndexMaster/src/luceneindexer/javascript/mainPage.js
	IndexMaster/src/luceneindexer/search/SearchDBpedia.java