Merge master into dev
Merge branch 'master' into dev

Conflicts:
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/link-tile/dialog/items/items/tab1/items/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/lists/curated/dialog/items/items/tab2/items/E1_style/options/option1/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/lists/curated/dialog/items/items/tab2/items/E1_style/options/option2/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/lists/curated/dialog/items/items/tab2/items/E1_style/options/option3/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/lists/curated/dialog/items/items/tab2/items/E2_imageFilter/options/option1/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/lists/curated/dialog/items/items/tab2/items/read-more-style/options/option3/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/lists/curated/dialog/items/items/tab2/items/width/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/lists/curated/dialog/items/items/tab2/items/width/options/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/lists/curated/dialog/items/items/tab2/items/width/options/option21/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/lists/queried/dialog/items/items/tab2/items/E1_style/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/lists/queried/dialog/items/items/tab2/items/E1_style/options/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/lists/queried/dialog/items/items/tab2/items/E2_imageFilter/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/lists/queried/dialog/items/items/tab2/items/read-more-style/options/option1/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/lists/queried/dialog/items/items/tab2/items/width/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/lists/queried/dialog/items/items/tab2/items/width/options/option21/@nodeinfo.xml
	CQFiles/CruOrgApp/@JCR_ROOT/apps/CruOrgApp/components/section/tile/dialog/items/items/tab2/items/text/@nodeinfo.xml
updated tile compoennt
readding js files
Updated xcqb version