Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
added datacenter capabilities
Merge pull request #78 from daniellemayne/develop

Develop: datacenter capabilities