testesssss
Merge branch 'master' of https://github.com/wccuser/grupodev

Conflicts:
	KdmediaNet/src/main/java/br/com/kmedianet/rest/TbCategoriaEndpoint.java
	KdmediaNet/src/main/webapp/consulta.html
xxx