CORS Filter added to allow client to consume REST services
Merge remote-tracking branch 'origin/master'