Merge branch 'master' of
https://github.com/guilhermehott/sislegis-app.git

Conflicts:
	src/main/webapp/app.html
	src/main/webapp/bower.json
	src/main/webapp/views/modal-encaminhamentos.html
Merge branch 'master' of https://github.com/guilhermehott/sislegis-app.git