Improve search behavior, return facebook avatar
Merge pull request #60 from worldintime/fix_search_bug

Fix incorrect search behavior
resolve merge conflicts
Merge pull request #61 from worldintime/email_confirmation_design

Email confirmation design
cors fix and seed for test data
Merge pull request #62 from worldintime/iba_69_user_avatar_update

cors fix and seed for test data
pending conversation when out of radius
push notification fix
accident push notification edit
add schema.rb and validation for pending conversation
conversation id validation fix
model tests
edit avatar
Merge pull request #65 from worldintime/iba_72_out_of_radius

Iba 72 out of radius
fix schema
Merge branch 'master' into test_coverage_2