Fixed fixie-demo.css
Merge remote-tracking branch 'origin/dev'