ELIPM merge bug
Merge branch 'xe3' of https://github.com/distributor/Distributor.Client into xe3
new SynEdit