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

Conflicts:
	KdmediaNet/src/main/webapp/views/home/home.html
Merge branch 'master' of https://github.com/wccuser/grupodev
dd
alterações
novas funcionalidades