Reworked rolw commands
Reworked rolw commands
Merge branch 'master' of https://github.com/magnusulf/Factions

Conflicts:
	src/main/java/com/massivecraft/factions/cmd/CmdFactions.java
	src/main/java/com/massivecraft/factions/cmd/CmdFactionsDemote.java
	src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeader.java
	src/main/java/com/massivecraft/factions/cmd/CmdFactionsOfficer.java
	src/main/java/com/massivecraft/factions/cmd/CmdFactionsPromote.java
	src/main/resources/plugin.yml