Merge pull request #146 from GrabNetworks/dev-cs

Dev cs 530
Versioning
Merge branch 'integration' into layout