first commit
mmm
mensagem
Merge branch 'development'

Conflicts:
	app/assets/javascripts/acompanhamentos_datatable.js.coffee
	app/assets/javascripts/centro_custos_datatable.js.coffee
	app/assets/javascripts/riscos_datatable.js.coffee
	app/views/advogados/show.html.erb