Backport of switch fixes.
Merge branch 'OC1.2-MC1.6' of github.com:MightyPirates/OpenComputers into OC1.2-MC1.7

Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
	src/main/scala/li/cil/oc/server/network/Network.scala