implemented the pattern where states are subclasses of the keyentities.
added new classes
Merge branch 'dev' of https://github.com/phenoscape/phenoscape-nlp.git
into dev

Conflicts:
	phenoscapeII/src/outputter/StateStatementParser.java
	phenoscapeII/src/outputter/XML2EQ.java
merging