Merge branch 'master' into enhance-scoresheet
Merge branch 'enhance-scoresheet'
require cardview.js

To make compatible with browserify