style.css was moved to assets in 20140929.1
Merge branch 'master' into cli