Test json added for history and snapshot
Revert "Test json added for history and snapshot"

This reverts commit f173f020819ccd6bddb6d4b8bce41b7dbe158335.
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Localization
e
.
Changed the strings
Merge branch 'develop' into localization
Conflicts:
	SolarPanelApp/src/com/example/solarpanelmanager/BatteryActivity.java
Merge branch 'develop' of https://github.com/SeanHurley/AndroidSolarPanelManager into develop