Merge origin/nova-web into nova-web

Conflicts:
	src/main/java/br/ifes/leds/sincap/web/controller/NotificacaoCaptacaoController.java
	src/main/webapp/WEB-INF/components/adm-menu-sidebar.xhtml