huebr
jonathan
Merge branch 'master' of https://github.com/PPD4si2012/sirh

Conflicts:
	src/Database/DBModel.Designer.cs
	src/Database/DBModel.edmx.diagram
	src/PraticaMVC/Controllers/ColaboradoresController.cs
Merge branch 'master' of https://github.com/PPD4si2012/sirh

Conflicts:
	src/Database/CBSATIVIDADES.cs
	src/Database/CSBCARGOS.cs
	src/Database/CSBCOMPETENCIAS.cs
	src/Database/CSBDEPARTAMENTO.cs
	src/Database/CSBDESCONTOS.cs
	src/Database/CSBENEFICIOS.cs
	src/Database/CSBFGTSPARAMETROS.cs
	src/Database/CSBFUNCOES.cs
	src/Database/CSBINSSPARAMETROS.cs
	src/Database/CSBIRRFPARAMETROS.cs
	src/Database/CSBPARAMETROSIRRF.cs
	src/Database/CSBSALARIOS.cs
	src/Database/CSBSFAMILIASALARIOPARAMETROS.cs
	src/Database/DBModel.Context.cs
	src/Database/DBModel.Designer.cs
	src/Database/DBModel.edmx
	src/Database/DBModel.edmx.diagram
	src/Database/FFCOLABORADORES.cs
	src/Database/FFCOLBENEFICIOS.cs
	src/Database/FFCOLCARGOS.cs
	src/Database/FFCOLREMUNERACOES.cs
	src/Database/FFCONTAS.cs
	src/Database/FFDEPBENEFICIOS.cs
	src/Database/FFDEPENDENTES.cs
	src/Database/FFEXAMES.cs
	src/Database/FFFALTAS.cs
	src/Database/FFFERIAS.cs
	src/Database/FFGRADUACOES.cs
	src/Database/FFOBSERVACOES.cs
	src/Database/FFOCORRENCIAS.cs
	src/Database/FFPESSOAS.cs
	src/Database/FFPONTOS.cs
	src/Database/RSCOLABORADORESVAGAS.cs
	src/Database/RSCOMPETENCIAENTREVISTA.cs
	src/Database/RSCURRICULOS.cs
	src/Database/RSENTREVISTA.cs
	src/Database/RSVAGAS.cs
	src/Database/TDINSTRUTORES.cs
	src/Database/TDTREINAMENTO.cs
Perfis