Laying the groundwork for WE compatibility
Some more WE compat work
Merge remote-tracking branch 'origin/master' into WEIntegration
Retarded Git.
Merge branch 'master' into WEIntegration
Merge branch 'master' into WEIntegration
Some bugfixing, a handful of errors remain.
Also needs PermsAPI injection.
Merge branch 'master' into WEIntegration
Git is like that :(
Merge branch 'WEIntegration' of https://github.com/ForgeEssentials/ForgeEssentialsMain.git into dev
Variable length censoring

Rewrote censoring to be variable replacement of characters for length of
censored words
Merge pull request #329 from jgdovin/dev

Variable length censoring, as requested?
Hope this works!
Herp derp forgot to register weintegration
And another one
Rules Command Permissions

Added ForgeEssentials.BasicCommands.rules.edit to allow permission check
for editing of rules.
Merge pull request #339 from jgdovin/dev

Rules Command Permissions
Merge remote-tracking branch 'origin/dev'

Conflicts:
	src/FE_SRC_COMMON/com/ForgeEssentials/WorldControl/ModuleWorldControl.java
	src/FE_SRC_COMMON/com/ForgeEssentials/commands/CommandRules.java
Merge branch 'master' of github.com:ForgeEssentials/ForgeEssentialsMain