Indev changes
Merge branch 'alpha' of github.com:megasus/CharImport

Conflicts:
	CharImport/Template_Database.Designer.vb
	CharImport/Template_Database.vb
	CharImport/obj/x86/Debug/CharImport.vbproj.FileListAbsolute.txt
	CharImport/obj/x86/Debug/CharImport_Test.Welcome.en.resources
	CharImport/obj/x86/Debug/CharImport_Test.Welcome.resources
	CharImport/obj/x86/Debug/de-DE/CharImport Test.resources.dll