Merge branch 'dev' into category_manager
Category icon and ribbon bar organization
Merge remote-tracking branch 'origin/dev' into category_manager

Conflicts:
	IncrediblyGorgeousCalendar/src/edu/wpi/cs/wpisuitetng/modules/cal/EventToolbarGroup.java
Merge remote-tracking branch 'origin/uiFixes' into category_manager
Only one category manager can be opened at a time
Category list now scrollable. Limited colorpicker black box range to size of colorpicker
disable html parsing on VGP
Merge remote-tracking branch 'origin/category_manager' into dev
Re-fixing Word wrap
Fixing scrolling details pane