Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugin.yml
	src/org/melonbrew/fe/FeCommand.java
	src/org/melonbrew/fe/command/commands/GrantCommand.java
	src/org/melonbrew/fe/command/commands/SetCommand.java
Merge branch 'master' of https://github.com/OdiumxXx/Fe

Conflicts:
	plugin.yml
	src/org/melonbrew/fe/command/commands/GrantCommand.java
	src/org/melonbrew/fe/command/commands/SetCommand.java