Merge pull request #82 from Watchful1/dev

Dev
ForgeEditor update
Merge remote-tracking branch 'origin/master' into master-local

Conflicts:
	source/mainClass.java
ForgeEditor update
temp commit
Merge branch 'master' of https://github.com/Watchful1/PermissionsChecker
Partial commit
Merge branch 'master' into dev

Conflicts:
	source/mainClass.java