Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/BananaJ/block/Material.java