fix some remaining js-errors
Merge branch 'master' into motivation_agent