merge
merge
Merge branch 'master' of https://github.com/robinvdijk/greendrive
searchresults and small bug fixes
searchresults and small bug fixes