updated CC API to 1.6
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Conflicts:
	src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java
	src/main/scala/li/cil/oc/common/Proxy.scala