Merge branch 'master' into development
Changed the search coloring
Merge branch 'development'