Removing application-context-per-environment and configuring through BridgeConfig
Updates after comments
Merge pull request #27 from alxdarksage/context

Removing application-context-per-environment and configuring through Bri...
Merge remote-tracking branch 'upstream/develop' into develop