Merge branch 'master' of github.com:charite/jannovar

Conflicts:
	src/main/java/jannovar/Jannovar.java
	src/main/java/jannovar/exome/Variant.java