Added Filter to add CORS headers
Merge branch 'master' into msp-team6-pq