changes for search
resolved merge conflict
Merge branch 'search' of github.com:utwente-di/di10 into search