Merge branch 'master' of git://github.com/Cloudhunter/OpenCCSensors
Started the 1.5 upgrade. This really will need re-working because it's URRGGGLLLLYYY
Erm, no comment.
re-implemented proximity
re-implemented dropped item, minecart, sign and sonic
reimplemented tank and inventory sensor
World sensor card reimplemented
Merge pull request #110 from lyqyd/master

Change to error return methodology.
ready for 0.1.4c
card registration
added support for UniversalElectricity
moved UniversalElectricity
re-implemented getMapData
bish bash bosh
updated build with current versions
added mcmod.info into the build
rejigging the gauge slightly
Merge branch 'master' of git://github.com/Cloudhunter/OpenCCSensors

Conflicts:
	openccsensors/OpenCCSensors.java
	resources/openccsensors/resources/lua/apis/sensor
	src/openccsensors/common/helper/BCHelper.java
	src/openccsensors/common/sensors/targets/WorldTarget.java
Merge pull request #111 from mikeemoo/master

Moving to 1.5
re-added resources, updated build