freepay02
Merge remote-tracking branch 'origin/ID009' into ID009

Conflicts:
	FreePay/.project
	FreePay/.settings/org.eclipse.wst.common.component
	FreePay/src/main/java/com/freepay/dominio/servicio/DatafonoService.java
	FreePay/src/main/webapp/WEB-INF/web.xml