Reruns/branch lms

@talbs conflict resolution s/b confirmed on cms/static/sass/views/_dashboard.scss, cms/static/sass/_base.scss