Merge branch 'dev' of https://github.com/CruGlobal/CruOrg into dev
Merge branch 'master' of https://github.com/CruGlobal/CruOrg into dev
Merge pull request #66 from CruGlobal/dev

Resync Master & Dev