unknown
Merge branch 'master' of github.com:glortho/csc

Conflicts:
	sites/all/modules/main_menu/plugins/content_types/main_menu.js
menu styles and optimization
hiding event image for now
sass/sites/all/themes/csc/css/style.scsscsc-11 fixed
Merge branch 'master' of github.com:glortho/csc
next event image removal