non-working version of HERO: COUNTRY PROFILE

Looks like secondImagePath was not finished or is not compatible with acs-commons renditions servlet
fix up of test imagepath outputs
Merge branch 'master' of https://github.com/CruGlobal/CruOrg into CountryProfile
Merge pull request #44 from CruGlobal/t-dev

T dev
Merge branch 'master' of github.com:CruGlobal/CruOrg into dev
FooterGlobalPathListContextProcessorTest: added support to new XCQB version.
AddMainNavigationTraversedPageListContextProcessor: remove cobertura warnings.
Merge pull request #45 from CruGlobal/dev

Dev
masonry fix and hero component

Template fixes for masonry
Updates for hero component for country pages
Merge branch 'master' of https://github.com/CruGlobal/CruOrg into CountryProfile

Conflicts:
	CQFiles/etc/@JCR_ROOT/etc/designs/@nodeinfo.xml
Merge pull request #46 from CruGlobal/CountryProfile

Country profile
Merge pull request #47 from CruGlobal/dev

Dev
Template Updates

Content template - added bottom-parsys for featured stories and related stories
Page template - moved Facebook comments into article above bottom-parsys
Merge pull request #48 from CruGlobal/ContentTemplate

Content template
Merge branch 'dev' of github.com:CruGlobal/CruOrg into t-dev