Merge branch 'hotfix/kill_switch'
updated ongair front page
Merge branch 'hotfix/remove_marks'
Merge branch 'hotfix/remove_marks' into develop
Changed page title
make admin checkbox
User phone number place holder
added submit button
Upload Ui
Validate upload contacts file types
refactored the contacts importer
removed unecessary comments
added location tests
completed merging conflicts
fixed merge conflicts
Merge branch 'master' into develop
removed setting of user on conversations
added ability to show notifications for chrome
request for permission before showing notifications
added desktop notifications