Updated captioned image functionality
Merge branch 'dev' of https://github.com/CruGlobal/CruOrg into dev