Merge branch 'master' of https://github.com/Upd4ting/sdk.git

Conflicts:
	sdk/plugin.yml