use viewmodel
Merge branch 'master' into gh-pages
use viewmodel