reports sin terminar
Merge branch 'master' of github.com:gitdb2/arqliv-cliente

Conflicts:
	src/main/resources/client-remoting.xml