Update views.py
Update plugin.js
Merge branch 'master' into kingman