added olive oil for scenario
Add filter text for small view
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into gh-pages