reverted to 7248c7578e
Merge branch 'master' of https://github.com/CruGlobal/CruOrg into dev

Conflicts:
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/page/htmlbase/clientlibs/js.txt
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/page/htmlbase/clientlibs/js/masonry.js
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/main-navigation/clientlibs/main-navigation/offcanvas.js