First version of search, not finished yet!

First version of search, not finished yet!
Merge remote-tracking branch 'origin/master' into new_feature_edit_class