baseURL added
Merge branch 'master' into uima

Conflicts:
	src/de/catma/document/repository/RepositoryPropertyKey.java