prueba
Merge branch 'master' of https://github.com/GCSoft/XCF

Conflicts:
	SafeTransfer.Web/Index.aspx