application.properties.template
application.properties.template
Merge branch 'dev' of https://github.com/phenoscape/phenoscape-nlp.git
into dev

Conflicts:
	parsing-gui/application.properties
	parsing-gui/application.properties.template
	phenoscapeII/application.properties
	phenoscapeII/application.properties.template