Actualizacion
Merge branch 'master' of https://github.com/elizabethreyes/multimedia_manager

Conflicts:
	Multimedia Manager/Database/DatabaseConfig.cs
	Multimedia Manager/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache