starting 1.6.1 upgrade
Merge remote-tracking branch 'remotes/origin/1_6_1'

Conflicts:
	src/openperipheral/core/item/meta/MetaButton.java
	src/openperipheral/core/item/meta/MetaCapacitor.java
	src/openperipheral/core/item/meta/MetaCarbon.java
	src/openperipheral/core/item/meta/MetaCoiledWire.java
	src/openperipheral/core/item/meta/MetaDuckAntenna.java
	src/openperipheral/core/item/meta/MetaElectrode.java
	src/openperipheral/core/item/meta/MetaEnergyCell.java
	src/openperipheral/core/item/meta/MetaIRLED.java
	src/openperipheral/core/item/meta/MetaIgniter.java
	src/openperipheral/core/item/meta/MetaLCDScreen.java
	src/openperipheral/core/item/meta/MetaLED.java
	src/openperipheral/core/item/meta/MetaMagnet.java
	src/openperipheral/core/item/meta/MetaMicroController.java
	src/openperipheral/core/item/meta/MetaModemComponent.java
	src/openperipheral/core/item/meta/MetaMotor.java
	src/openperipheral/core/item/meta/MetaOptoIsolator.java
	src/openperipheral/core/item/meta/MetaPCB.java
	src/openperipheral/core/item/meta/MetaPIRSensor.java
	src/openperipheral/core/item/meta/MetaPlasticSheets.java
	src/openperipheral/core/item/meta/MetaPreparedBoard.java
	src/openperipheral/core/item/meta/MetaRawPlastic.java
	src/openperipheral/core/item/meta/MetaResistor.java
	src/openperipheral/core/item/meta/MetaRibbonCable.java
	src/openperipheral/core/item/meta/MetaServo.java
	src/openperipheral/core/item/meta/MetaSilislimeRubber.java
	src/openperipheral/core/item/meta/MetaSingleDigitDisplay.java
	src/openperipheral/core/item/meta/MetaSolarCell.java
	src/openperipheral/core/item/meta/MetaThinWire.java
	src/openperipheral/core/item/meta/MetaToggleSwitch.java
	src/openperipheral/core/item/meta/MetaTransistor.java
replaced cc api