.
Merge branch 'master' of github.com:linuxyun/YunBox

Conflicts:
	YunBox/YunBox.Client.Window.Foundation/ViewModels/PaperTypeDetailViewModel.cs
	YunBox/YunBox.Client.Window.Foundation/ViewModels/PaperTypeViewModel.cs
	YunBox/YunBox.Client.Window.Foundation/YunBox.Client.Desktop.Foundation.csproj