Worked on LexiconUI table column changing. No idea how to load from DB to table.
Merge branch 'master' of https://github.com/inpaner/linguist-assistant

Conflicts:
	Linguist Assistant Redo/src/ontology/model/ConceptDAO.java