合并
Merge branch 'master' of github.com:piaolingzxh/Justin
Merge branch 'master' of github.com:piaolingzxh/Justin
Merge branch 'master' of github.com:piaolingzxh/Justin
Merge branch 'master' of github.com:piaolingzxh/Justin

Conflicts:
	Justin.Solution/Justin.Controls/Justin.BI/Justin.BI.csproj