Updating UE
Updated Battery Box
Merge branch 'master' into UE-2.0

Conflicts:
	src/basiccomponents/common/BasicComponents.java
Merge branch 'master' into UE-2.0
Update to new UE 2.0
Merge branch 'UE-2.0' of https://github.com/calclavia/Basic-Components into UE-2.0
Fixed most bugs from Aidan's changes
Crash fixes and improvements, Electric Furnace currently broken
Fixed electric furnace
Removed unused fields
Preliminary 1.6 update.
Merge pull request #15 from micdoodle8/UE-2.0

Preliminary 1.6 update.
Fix imports with recent UE 2.0 changes.
Merge pull request #16 from micdoodle8/UE-2.0

Fix imports with recent UE 2.0 changes.
Merge branch 'UE-2.0'