update
Merge branch 'master' of https://github.com/Htbaa/SEN.git

Conflicts:
	xmlgenerator/xmlGenerator/xmlGenerator/bin/Debug/xmlGenerator.exe
	xmlgenerator/xmlGenerator/xmlGenerator/bin/Debug/xmlGenerator.pdb
	xmlgenerator/xmlGenerator/xmlGenerator/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	xmlgenerator/xmlGenerator/xmlGenerator/obj/x86/Debug/GenerateResource.read.1.tlog
	xmlgenerator/xmlGenerator/xmlGenerator/obj/x86/Debug/xmlGenerator.exe
	xmlgenerator/xmlGenerator/xmlGenerator/obj/x86/Debug/xmlGenerator.pdb
Merge branch 'master' of https://github.com/Htbaa/SEN