Zit3165 ver2
complete merge Zit3165
Merge branch 'dev' of https://github.com/distributor/Distributor.Client into dev