search, labels and css
Merge branch 'master' into gh-pages
search, labels and css