Updated markup,js and recompiled scss
Merge branch 'master' into gh-pages