Added real JavaOS
Merge branch 'master' into Fixes

Conflicts:
	src/minecraft/javacraft/computer/TileEntityComputer.java