Made some small changes. establishing parts before pulling latest dev.
Simple changes and main merge in.
//Merge branch 'dev' of https://github.com/tomorrow-nf/wpi-suite-team5 into dev

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/EventEditor.java