Removendo o módulo WEB. Adicionando o Módulo REST
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/pom.xml
	web/src/main/webapp/index.jsp