Merge pull request #34 from bigamckay/wip/switch-view-functionality

Private and Personal view selection
Personal Events are Red, Team events are Blue, Both events are purple,
If you erase, I will own you -_-
Merge pull request #35 from bigamckay/wip/calendargui

Event colorizations complete. Arf arf
Merge pull request #37 from bigamckay/wip/switch-view-functionality

Let's get calendargui back up and working....
Commented out the server get to avoid some problems.
Merge pull request #38 from bigamckay/wip/calendargui

best dev ever
Merge remote-tracking branch 'origin/dev' into wip/server-event/get
Merge remote-tracking branch 'origin/dev' into wip/server-event/get

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/views/CalendarCalendarView.java