add max age to cors headers
Merge branch 'master' into production