Enable CORS support for Serrano
Update to Serrano 2.1.3 to fix follow-up CORS issue
Merge branch 'master' into demo