Work in progress
Merge pull request #81 from quiaro/master

Merges branch 'dynamic-injection'
Merge remote-tracking branch 'upstream/master'
Swagger integration
Merge pull request #82 from dejan-brkic/master

Swagger Integration
Enables CORS in the dev and build mock servers