major changes to support output from GAIL
GAIL now outputs through ArgumentTree
fix loading of conjunctions, and conjunction outputs
Merge branch 'gui'

Conflicts:
	src/ArgumentStructure/ArgumentFactory.java
	src/ArgumentStructure/ArgumentObject.java
	src/ArgumentStructure/XMLWriter.java
Merge remote-tracking branch 'origin/master' into gui

Conflicts:
	src/ArgumentStructure/ArgumentFactory.java
	src/ArgumentStructure/ArgumentObject.java
	src/ArgumentStructure/XMLWriter.java
removal or argtype
Merge branch 'gui'

Conflicts:
	src/ArgumentStructure/ArgumentFactory.java
	src/ArgumentStructure/ArgumentObject.java
	src/ArgumentStructure/XMLWriter.java