Merge branch 'hotfix/prod_bug_fixes_08092014' into develop
Merge branch 'develop' of https://github.com/sproutke/ongair into develop
Merge branch 'hotfix/account_appear_offline'
Merge branch 'hotfix/change_data_type_of_targets'
modified Gemfile.lock, db/schema.rb
When a user belongs to more than one account, deleting them should only remove the UserAccount record for that particular account
Merge branch 'master' into develop
When deleting account, user belonging to multiple accounts should not be deleted
created support user
support user should not be deleted
Merge branch 'develop' of https://github.com/sproutke/ongair into develop
Changes
Strip emoji in Concern
Strip emoji in Concern
added is_support
added support user password to application.example.yml
Merge branch 'develop' into feature/improve_user_management
Merge branch 'feature/improve_user_management' into develop
Merge branch 'feature/strip_emoji' into develop
Merge branch 'develop' into feature/improve_new_message_discovery