Update zh_CN.lang
Merge pull request #585 from ViKaleidoscope/patch-2

Update zh_CN.lang
Small robot fluid error message fix.
Repackaging LuaJ and JNLua to avoid conflicts with other mods. Closes #586.
Merge branch 'master' of github.com:MightyPirates/OpenComputers
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/server/component/robot/Robot.scala