Merge branch 'master' of https://github.com/kaizi99/SCSP.git

Conflicts:
	SCSP/src/plugin.yml
Merge branch 'master' of https://github.com/kaizi99/scsp.git