Axiom refactor.
Merge branch 'master' of https://github.com/isi-metaphor/Metaphor-ADP

Conflicts:
	KBs/English/English_compiled_KB.da
	KBs/Farsi/Farsi_compiled_KB.da
	KBs/Russian/Russian_compiled_KB.da
	KBs/Spanish/Spanish_compiled_KB.da