Integrated Jimmy's changes to the template
Merge branch 'dev' of https://github.com/CruGlobal/CruOrg into dev