Fixed a bunch of errors
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/minecore/minepermit/MinePermit.java