Resolved Conflicts
Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
*Added dependency for CORS Filter
Merge pull request #452 from saravanab/master

*Added dependency for CORS Filter