Rating and search
Merge branch 'Sophie' of https://github.com/utwente-di/di14 into Sophie
RESTful services en deel tests
Merge branch 'temp_iris'
Add .project, disappeared due to merge
Merge branch 'Sophie'
Merge branch 'Bas' of https://github.com/utwente-di/di14 into Bas
Merge branch 'Bas'
fixed git for the millionth time