Merge branch 'master' of github.com:edsu/mediator
Added search and sort bit.