Merge tag 'v2.0.4'

2.0.4
Fix the default CORS options
Merge pull request #93 from strongloop/feature/fix-cors

Fix the default CORS options
Bump version
Merge branch 'release/2.0.5' into production