Updated plugin.yml
Merge branch 'master' of https://github.com/Conquer-Dev/Conquer-Core

Conflicts:
	conquer-core/src/main/resources/plugin.yml