fixed bugs
add a lib
added a few files
fixed a few bugs
fixed a few patterns
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	phenoscapeII/application.properties
	phenoscapeII/src/outputter/Dictionary.java
	phenoscapeII/src/outputter/RelationHandler.java