Feature/project search

Marco's code without the files from the merge conflicts :-)