update search
Merge branch 'master' of https://github.com/EPL361-TEAM-A-2014/FIRST-PROTOTYPE