Merge branch 'master' into checkin
validaciones

validaciones fechas
Merge branch 'master' into carga
Cambios
Merge branch 'carga' of https://github.com/UPC-TP3-2014-2/UPC-TP3.git
Tercer caso de uso.. =D
Gestionar filmacion
Merge pull request #26 from UPC-TP3-2014-2/personal

Personal
Verificacion de equipaje
Merge remote-tracking branch 'origin/master' into checkin

Conflicts:
	UPC.CruzDelSur.sln
Merge pull request #30 from UPC-TP3-2014-2/checkin

Gestion de filmacion
Merge pull request #31 from UPC-TP3-2014-2/personal

[Personal] las solicitudes de capacitacion ahora se anulan
Merge pull request #32 from UPC-TP3-2014-2/personal

[Personal] actualizado script de BD con ultimos cambios de personal
Verificafar equipaje
Merge branch 'checkin' of https://github.com/UPC-TP3-2014-2/UPC-TP3.git
Merge pull request #36 from UPC-TP3-2014-2/personal

[Personal] Correcciones de errores
Merge remote-tracking branch 'origin/master' into checkin
Merge pull request #35 from UPC-TP3-2014-2/checkin

Verificar equipaje
Merge branch 'master' into carga

Conflicts:
	Cliente/UPC.CruzDelSur.Cliente.Carga/Web.config
Merge pull request #37 from UPC-TP3-2014-2/carga

Carga