temporary commit, still working
message
Merge branch 'dev' into wip/wvFixes

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/views/CalendarCalendarView.java
Week view now switches between weeks correctly, including field
population.
Added filter such that just team or just personal events (or both) (or
neither) will populate calendar at a time, and show up in different
colors. Rachel, TJ, Yael, Ryan.
Merge pull request #32 from bigamckay/wip/wvFixes

Week view moves properly between weeks
Merge branch 'wip/calendargui' into wip/switch-view-functionality

Conflicts:
	Calendar/.classpath
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/views/CalendarCalendarView.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/views/CalendarEventView.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/views/ToolbarView.java
Merge pull request #34 from bigamckay/wip/switch-view-functionality

Private and Personal view selection