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

Conflicts:
	source/mainClass.java
ForgeEditor update