.
Merge branch 'master' of https://github.com/tkMageztik/SICWEB_INDUMET

Conflicts:
	SICSoftware/SICSoftware/SIC.EntityLayer/SICModel.Designer.cs
	SICSoftware/SICSoftware/SIC.EntityLayer/SICModel.edmx
	SICSoftware/SICSoftware/SIC.UserLayer/UserControl/wucMensajeAlerta2.ascx
	SICSoftware/SICSoftware/SICSoftware.suo