Merge branch 'master' into emi-branch
updating _views.scss
updating views.scss
Merge branch 'emi-branch'