.
Merge branch 'master' of https://github.com/semiramis/xmlparser.git

Conflicts:
	src/fpa/xmlparser/XmlParser.java