Merge pull request #60 from worldintime/fix_search_bug

Fix incorrect search behavior
resolve merge conflicts
Merge branch 'email_confirmation_design' into staging