Have initial preference screen working. Need to tie in other activities to check the preferences
Changes parsers to look for error codes.
Merge branch 'power_user' into develop
Fixed snapshot parsing bug
Added sample snippets throughout the project of how to get the right device from shared preferences
Refactoring of ConnectActivity and made device of CommunicationHandler
a parameter.
Changed the initial colors of the app to be a slightly more pleasant
fixed merge
Fixed tests
Merge branch 'devicelist' into develop
Added ActionBarSherlock submodule.
Worked actionbarsherlock into the project now.
Changed the flow of the app to now make more sense
Fixed test project target api
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
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