added some checks that allow code to run and fixed sherlock theme
added history button to settings menu
Added a quick comment about deprecated method calls
Timestamp
Prettied up the code and actually tied it into the data
Merging and also fixing a bug with the gui on the battery screen showing too early
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
Merge branch 'historygraphfixfont' of github.com:SeanHurley/AndroidSolarPanelManager into historygraphfixfont