Merge git://github.com/MassiveCraft/Factions

Conflicts:
	plugin.yml
Merge git://github.com/MinecraftWars/Factions

Conflicts:
	plugin.yml