no message
Merge branch 'master' of https://github.com/bkahlert/seqan-research

Conflicts:
	.metadata/.plugins/org.eclipse.core.runtime/.settings/de.fu_berlin.imp.apiua.groundedtheory.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	CodeStore.xml
no message
no message