fix merge problem
some fixes to codegenerator
fix code gen problems

fix enumSet property
fix codeLine from wsdl generation