commented out broken tests
Merge branch 'dev' of https://github.com/frenchie16/wpi-suite-team6.git into dev
Merge branch 'dev' of https://github.com/frenchie16/wpi-suite-team6.git into dev
Merge branch 'dev' of https://github.com/frenchie16/wpi-suite-team6.git into dev
Merge branch 'dev' of https://github.com/frenchie16/wpi-suite-team6.git into dev
added event population in month view and fixed it in year view
Month View label changes based on current month. - Ryan
Merge pull request #20 from bigamckay/feat/monthview

Feat/monthview
Merge branch 'dev' of https://github.com/frenchie16/wpi-suite-team6.git into dev
Merge branch 'feat/visualize-new-events' of https://github.com/frenchie16/wpi-suite-team6.git into feat/visualize-new-events
made teamview and privateview buttons checkboxes
Added color indication of newly created events to month and year view
(Rachel, Ryan, Robert)
Merge pull request #21 from bigamckay/feat/radiobuttons

made teamview and privateview buttons checkboxes
Merge branch 'dev' into feat/visualize-new-events
merged in dev
Merge pull request #22 from bigamckay/feat/visualize-new-events

Feat/visualize new events
Enable transient field storage on [java.util.]Calendar objects
Merge remote-tracking branch 'origin/bug/23' into wip/server-event/get

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