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.
Merge pull request #32 from bigamckay/wip/wvFixes

Week view moves properly between weeks