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

Conflicts:
	YunBox/YunBox.DAL.Test/PaperTypeDALTest.cs
	YunBox/YunBox.DAL/PaperTypeDAL.cs
Merge branch 'master' of github.com:linuxyun/YunBox
Merge branch 'master' of github.com:linuxyun/YunBox
.