Image renditions update
Added nodesorder property
Merge branch 'dev'
Main Nav Filter fix
Added new node reordering properties
Merge branch 'master' into image-renditions
Style update
Renditions configuration update
node ordering
Merge branch 'image-renditions' into dev

Conflicts:
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/captioned-image/dialog/items/items/B_tab/items/@nodeinfo.xml