Added gets
Added gets
Merge origin/master

Conflicts:
	src/xml/XMLDocument.java
Merge origin/master