node ordering
Merge branch 'dev'

Conflicts:
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/captioned-image/dialog/items/items/B_tab/items/C_style/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/daily-content/dialog/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/daily-content/dialog/items/items/tab1/items/C_periodicity/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/daily-content/dialog/items/items/tab1/items/C_periodicity/items/A_date/items/B_endDate/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/daily-content/dialog/items/items/tab1/items/C_periodicity/items/C_excludeYear/@nodeinfo.xml
Updated the isArticlePage() method on the PageUtils class so it checks for the page's resource type instead of its template.
added the MapImagePathsContextProcessor which uses the resource resolver to map the main slider image paths if necessary, since they are not inside an 'img' HTML tag, they won't be automatically rewritten.