main navigation
Merge branch 'dev' into main-navigation

Conflicts:
	osgi/CruOrg/src/main/java/org/cru/logiclesstemplates/processors/dailycontent/AddContentServletPathContextProcessor.java
Main Navigation context processor
Redirect template
Main Navigation
Changed daily content selector as it was colliding with a new xumak base selector
traversed country list icon
Merge branch 'dev' into main-navigation
Merge branch 'dev'