Added filterChains
Updated Cors to support new FilterChain design
Merge branch 'master' into database