antes do merge
Merge branch 'master' of github.com:damaral/projetoBI into daniel
relatorio rh projecao pessoal
Merge branch 'master' of github.com:damaral/projetoBI into daniel

Conflicts:
	log/development.log