AVANCE DEL FINAL
Merge remote-tracking branch 'origin/master'

Conflicts:
	StoreOnLine/StoreOnLine.csproj
	StoreOnLine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache