merge
Merge branch 'patch42_141201' into uima

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