modify
Merge branch 'master' of github.com:awllif/ckpa

Conflicts:
	CK_PluginOrder/Class1.cs
modify