adapted search criteria
solved merge conflicts
improved search list
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team4