testing dayview
Merge branch 'dev' of http://github.com/tomorrow-nf/wpi-suite-team5 into dev
might be working right
Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/DayView.java