eileen
Merge branch 'mj_daisy_h5_new'

Conflicts:
	pages/app/look_app/index.html
	pages/subjects/beauty_report/css/index.css
	statics/app/look_app/js/index.js