Merge branch 'gh-pages'
Merge branch 'master' into develop
add note about sass version in readme
Merge branch 'develop' into gh-pages