no message
no message
Merge branch 'master' of https://github.com/luchoespejo/SOFTDENTAL

Conflicts:
	MvcSoftDental/MvcSoftDental.v11.suo
	MvcSoftDental/MvcSoftDental/Web.config
Merge branch 'master' of https://github.com/luchoespejo/SOFTDENTAL

Conflicts:
	MvcSoftDental/MvcSoftDental.v11.suo
	MvcSoftDental/MvcSoftDental/Web.config
no message