update
Merge branch 'develop' of https://github.com/SeanHurley/AndroidSolarPanelManager into battery_image

Conflicts:
	SolarPanelApp/src/com/example/solarpanelmanager/BatteryActivity.java
Fixed and cleaned up the battery activity screen