test by kim

Signed-off-by: jinshen <shen.jin19810809@gmail.com>
Merge branch 'master' of https://github.com/shjinshen/PackageWorkStation_Beta

Conflicts:
	AJ.DMES.PackageWorkstation.UI.Wpf/App.config
	AJ.DMES.PackageWorkstation.UI.Wpf/App.xaml.cs