Modified the event api to take a name and auto generate an id on control box.
Added basic calendar for new event
Added remove method
Added conflict check to event addition
Changed graph font sizes and added grid
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
Changed api calls to use the prefences to pick a deviceid
Fixed preference screen bug and also made batterysettings screen only show extra info if in power user mode
started on CalendarActivity and made minor changes to Calendar
Added easier to use addEvent
Localization
forgot xml file
e
.
merged with develop
Merge branch 'develop' into calendar
Changed the strings