Merge branch 'hotfix/duplicate_messages'
Conversation validation
fixed errors with conversations not having either a group or contact
fixed error with group conversations
Merge branch 'hotfix/conversation_validation'
Merge branch 'hotfix/conversation_validation' into develop
change the data type for joblogs#targets from string to text
Account appear online
added debug to gitignore
Merge branch 'develop' into hotfix/account_appear_offline
Merge branch 'develop' into feature/image_download_and_forward
Permitted new columns in controller
Merge branch 'hotfix/account_appear_offline' of https://github.com/sproutke/ongair into hotfix/account_appear_offline
used ability to restrict setting of offline times
Merge branch 'hotfix/account_appear_offline' into develop
expanded targets data type
Merge branch 'hotfix/change_data_type_of_targets' into develop
merged upto develop
removed unused stylesheets