modified:   cms/static/sass/elements/_footer.scss
	modified:   lms/static/sass/base/_base.scss
	modified:   lms/templates/courseware/courses.html
	modified:   lms/templates/index.html
Merge branch 'master' of https://github.com/hwjworld/xiaodun-platform