Edited parser
Merge remote-tracking branch 'origin/master'

Conflicts:
	XMLParser/src/xmlparser/XMLParser.java