commit
Merge branch 'master' of https://github.com/popitsch/codoc.git

Conflicts:
	src/main/java/at/cibiv/codoc/CoverageTools.java