search, css-refactoring, new note
Merge branch 'dev'