Parse
Merge branch 'master' of https://github.com/luciano-sabenca/MC437_Grupo3

Conflicts:
	src/main/java/mc437/service/XMLService.java
	src/test/java/stories/JBehaveConfiguration.java
	src/test/java/stories/UploadXml.java