temp commit
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	phenoscapeII/bin/conceptmapping/TermOutputerUtilities.class
	phenoscapeII/src/outputter/XML2EQ.java
Inserting the proposals into tables
Insert into table & characer, state label population
HTMLOutput
Merge branch 'dev' of https://github.com/phenoscape/phenoscape-nlp.git
into dev

Conflicts:
	phenoscapeII/bin/conceptmapping/TermOutputerUtilities.class
	phenoscapeII/src/outputter/XML2EQ.java
added a jar
whatever
Revert "added a jar"

This reverts commit fa0e35182f26073059725a4b58ee1eea0f357534.
add the jar
Revert "added a jar"

This reverts commit fa0e35182f26073059725a4b58ee1eea0f357534.
Merge branch 'dev' of https://github.com/phenoscape/phenoscape-nlp.git into dev