Update vcr
Improvements to admin
Merge branch 'master' into staging