Tool Bar modifications/fixes for mac views, special egg
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/CalendarToolBar.java
merge fixes