dummy commit to test build
add production domains to CORS whitelist
Merge branch 'master' into prod