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

Conflicts:
	KdmediaNet/src/main/java/br/com/kmedianet/model/TbCategoria.java
	KdmediaNet/src/main/java/br/com/kmedianet/repository/ICategoriaRepository.java
	KdmediaNet/src/main/java/br/com/kmedianet/repository/impl/AnuncioRepository.java
	KdmediaNet/src/main/java/br/com/kmedianet/repository/impl/CategoriaRepository.java
	KdmediaNet/src/main/java/br/com/kmedianet/rest/TbCategoriaEndpoint.java