Update Gemfile (sass 3.4.7 fixed).
Merge branch 'master' into demo