Changed Date class to Calendar class
Changed Date to Calendar
Merge branch 'calendar' of github.com:SeanHurley/AndroidSolarPanelManager into calendar

Conflicts:
	SolarPanelApp/src/com/example/calendar/BasicCalendar.java