Modified XML feature names to match DB.
Merge branch 'master' of https://github.com/inpaner/linguist-assistant

Conflicts:
	Linguist Assistant Redo/src/semantics/model/Constituent.java
Merge branch 'master' of https://github.com/inpaner/linguist-assistant

Conflicts:
	Linguist Assistant Redo/src/rule/spellout/Simple.java
	Linguist Assistant Redo/src/semantics/controller/SemanticEditor.java