implementing battery consumption
Merge branch 'master' into items

Conflicts:
	src/environment/blocks/BatteryReceptacleBlock.java