Resteasy
Merge branch 'master' of https://github.com/gonzalomelov/geored-uy.git

Conflicts:
	pom.xml