.

Signed-off-by: Vandhuy <vandhuy.martins@dce.ufpb.br>
Merge branch 'master' of https://github.com/dhuyy/Bloomer-CORE

Conflicts:
	Bloomer-CORE/src/main/webapp/relatorio/js/desempenho.js
nothing

Signed-off-by: Vandhuy <vandhuy.martins@dce.ufpb.br>