Merge pull request #22 from nikolalazovski/proto

Proto
Merge remote-tracking branch 'upstream/integration' into proto

* upstream/integration:
ConfigurationManager dev