Cambios extra

Planografo y otros archivos
Merge branch 'master' of https://github.com/Xkrowth/AutoStar

Conflicts:
	AutoStar/AutoStar/bin/AutoStar.dll
	AutoStar/AutoStar/bin/AutoStar.pdb
	AutoStar/AutoStar/bin/GridViewExtended.dll
	AutoStar/AutoStar/bin/GridViewExtended.pdb
	AutoStar/AutoStar/obj/Debug/AutoStar.csprojResolveAssemblyReference.cache
	AutoStar/AutoStar/obj/Debug/AutoStar.dll
	AutoStar/AutoStar/obj/Debug/AutoStar.pdb
	AutoStar/GridViewExtended/bin/Debug/GridViewExtended.dll
	AutoStar/GridViewExtended/bin/Debug/GridViewExtended.pdb
	AutoStar/GridViewExtended/obj/Debug/GridViewExtended.dll
	AutoStar/GridViewExtended/obj/Debug/GridViewExtended.pdb
Merge branch 'master' of https://github.com/Xkrowth/AutoStar

Conflicts:
	AutoStar/AutoStar/app/ppAsignacion_Parqueos.aspx
	AutoStar/AutoStar/app/ppAsignacion_Parqueos.aspx.cs
	AutoStar/AutoStar/app/ppAsignacion_Parqueos.aspx.designer.cs
	AutoStar/AutoStar/bin/AutoStar.dll
	AutoStar/AutoStar/bin/AutoStar.pdb
	AutoStar/AutoStar/obj/Debug/AutoStar.dll
	AutoStar/AutoStar/obj/Debug/AutoStar.pdb