Another One
Merge https://github.com/rolllOnEnglish/ROE.1.9

Conflicts:
	Roll-on_English/Plantillas_Todas/Plantillas_Todas.csproj
	Roll-on_English/Plantillas_Todas/ROE.Templates.csproj
	Roll-on_English/Plantillas_Todas/Templates.csproj
	Roll-on_English/Plantillas_Todas/obj/Debug/AxInterop.ShockwaveFlashObjects.dll
	Roll-on_English/Plantillas_Todas/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	Roll-on_English/Plantillas_Todas/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Roll-on_English/Plantillas_Todas/obj/Debug/Interop.ShockwaveFlashObjects.dll
	Roll-on_English/Plantillas_Todas/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
	Roll-on_English/ROE.A1/obj/Debug/ROE.A1.csproj.FileListAbsolute.txt
	Roll-on_English/Roll-on_English.sln
	Roll-on_English/Roll-on_English.v11.suo
Merge https://github.com/rolllOnEnglish/ROE.1.9