sandro
sandro 2
Merge branch 'master' of https://github.com/PPD4si2012/sirh

Conflicts:
	src/Database/CBSATIVIDADES.cs
	src/Database/CBSMOVIMENTOS.cs
	src/Database/CBSMOVSEQUENCIAIS.cs
	src/Database/CSBDEPCARGOS.cs
	src/Database/CSBENEFICIOS.cs
	src/Database/CSBFUNCOES.cs
	src/Database/CSBPERIODO.cs
	src/Database/DBModel.Context.cs
	src/Database/DBModel.edmx
	src/Database/DBModel.edmx.diagram
	src/Database/FFCOLABORADORES.cs
	src/Database/FFCOLBENEFICIOS.cs
	src/Database/FFCOLCARGOS.cs
	src/Database/FFCONTRATOS.cs
	src/Database/FFDEPBENEFICIOS.cs
	src/Database/FFDEPENDENTES.cs
	src/Database/FFPESSOAS.cs
	src/Database/FFPONTOS.cs
	src/Database/RSCOLABORADORESVAGAS.cs
	src/Database/RSCOLABORADORVAGA.cs
	src/Database/SISEMPRESAS.cs
	src/Database/SISLOG.cs
	src/Database/TDINSTRUTORES.cs
	src/Database/TDTREINAMENTO.cs