Merge branch 'dev' into wip/switch-view-functionality
Merge branch 'wip/switch-view-functionality' of
https://github.com/frenchie16/wpi-suite-team6.git into
wip/switch-view-functionality

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/views/CalendarCalendarView.java
Event names for testList events now show in GUI weekView. Does not
null-out table upon changing weeks. (With Ryan & Robyn)
Merge branch 'wip/populate-day-week' of
https://github.com/frenchie16/wpi-suite-team6.git into
wip/populate-day-week
shows events in week view in the correct weeks
Improved event name showing, should now be corner-case resilient
I think all week-view bugs are now fixed
Fixed issues of events showing up when they should not be depending on
the view selected.
Added ability for ToolbarView to get the Tab View
Commit to pull
Merge branch 'wip/populate-day-week' of
https://github.com/bigamckay/wpi-suite-team6.git into
wip/populate-day-week

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/views/CalendarCalendarView.java
Added event names to day and week view (Ryan)
Merge remote-tracking branch 'origin/dev' into wip/populate-day-week

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/entitymanagers/EventManager.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/utils/DateTimeUtils.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/views/CalendarCalendarView.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/views/ToolbarView.java
Fixed build errors
Finished Day, Week, Month, and Year view displaying event creation. All
Ryan, not Rob.
Merge branch 'wip/populate-day-week' of https://github.com/bigamckay/wpi-suite-team6.git into wip/populate-day-week
Refixed events appearing in all views. Ryan again, not Rob.
Merge pull request #49 from bigamckay/wip/populate-day-week

Wip/populate day week. Events populate in ALL views. Worked on by Ryan.