improve category naming convention to prevent file name conflicts
Merge branch 'master' of github.com:holyman2k/WXKit

Conflicts:
	WXKit/WXKit/WXKit.h