Cambios locales de nuevo estable pero sin splash
Merge branch 'master' of https://github.com/riickky45/Triton

Conflicts:
	Acuanet/Acuanet/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache