Merge branch 'master' of https://github.com/sproutke/ongair
Merge branch 'release/stats_'
Save code request timestamp on user register
error using rollbar
save code timestamp from accounts not users
upgrade to rails 4.0.9
Merged remote
added mocking using mocha
removed poltergeist
Merge branch 'hotfix/error_logging'
Merge branch 'hotfix/error_logging' into develop
Bulk contact upload handled blank rows
Merge branch 'master' of https://github.com/sproutke/ongair
Merge branch 'master' into hotfix/upload_error
fixed error with emojis in messages
merged from origin
Merge branch 'hotfix/upload_error'
merged to develop
not saving images if the message is a duplicate
added ability to delete images