ljw
Merge branch 'master' of https://github.com/awllif/package
ljw
Merge branch 'master' of github.com:awllif/package into guanjianbin

Conflicts:
	CK_PluginOrder/Class1.cs