Merge origin/master

Conflicts:
	XML/src/factoria/ToXMLable.java
Merge origin/master