deb
Merge branch 'master' of http://github.com/luchoespejo/SOFTDENTAL

Conflicts:
	MvcSoftDental/MvcSoftDental.v11.suo
	MvcSoftDental/MvcSoftDental/MvcSoftDental.csproj
	MvcSoftDental/MvcSoftDental/Views/Shared/_BootstrapLayout.cshtml
	MvcSoftDental/MvcSoftDental/bin/MvcSoftDental.dll
	MvcSoftDental/MvcSoftDental/bin/MvcSoftDental.pdb
	MvcSoftDental/MvcSoftDental/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	MvcSoftDental/MvcSoftDental/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MvcSoftDental/MvcSoftDental/obj/Debug/MvcSoftDental.csproj.FileListAbsolute.txt
	MvcSoftDental/MvcSoftDental/obj/Debug/MvcSoftDental.csprojResolveAssemblyReference.cache
	MvcSoftDental/MvcSoftDental/obj/Debug/MvcSoftDental.dll
	MvcSoftDental/MvcSoftDental/obj/Debug/MvcSoftDental.pdb