update
commit
Merge branch 'master' of https://github.com/cmma86/sor_presa

Conflicts:
	gestor_servicio/gestor_servicio/App_Data/Database.mdf
	gestor_servicio/gestor_servicio/App_Data/Database_log.ldf