~ Updated version.
Merge remote-tracking branch 'origin/master' into 'wolvereness/master'

Conflicts:
	src/main/resources/plugin.yml