Started with search
Merge branch 'search'
Bugfix with search. Please use this master version for future branches!
Clean up version. Ready for Iteration 2
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team5 into restrictions