allow search to search both users and events. Also created search controller
Merge branch 'master' of github.com:caryli/beastgodcalendar