roles_and_js_log
Merge branch 'master' into emberization
~~~