Conflict resolution business
Merge branch 'master' of https://github.com/Sidetalker/TMRMaker

Conflicts:
	Java TMR Generation/Java TMR Generation.iml
	Java TMR Generation/knowledgeBase/semanticDeriver/Deriver.java