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
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