modifying model
Merge branch 'master' of https://github.com/nvelasquez/TDACL
Commiting changes
Conflicts:
	BO/Reps/UsuarioRepository.cs
	BO/bin/Debug/BO.dll
	BO/bin/Debug/BO.pdb
	BO/db.Designer.cs
	BO/db.edmx
	BO/db.edmx.sql
	BO/obj/Debug/BO.dll
	BO/obj/Debug/BO.pdb
	BO/obj/Debug/TempPE/db.Designer.cs.dll
	BO/obj/Debug/edmxResourcesToEmbed/db.msl
	BO/obj/Debug/edmxResourcesToEmbed/db.ssdl