Merge branch 'dev' into test&fix
fix description html_safe
admin user - add offline scope
fix active admin job
Merge branch 'dev' into test&fix
fix Timer.js
fix time online
Merge pull request #222 from SBS-team/test&fix

Test&fix