Use or-equal. spelling error
Update attachment.rb, set back S3/Heroku behavior
room refresh issue fix
Link authors to github account
Merge pull request #275 from donthorp/link-contributors

Link authors to github account
Merge pull request #273 from flashharry82/#256

room refresh issue fix #256
Merge branch 'master' of https://github.com/keyvanfatehi/kandan into keyvanfatehi-master
closes #261
Merge pull request #263 from pifleo/patch-1

Update attachment.rb, set back S3/Heroku behavior
Add link to the README.md

Link the README.md with the DEPLOY.md.
Fixed the build - updated debugger so it will work on ruby 2.0.
Merge pull request #277 from albertogg/readme-info

Add link to the README.md
added ruby-bundler dependency
Merge pull request #281 from gabeio/patch-1

added ruby-bundler dependency
Avatar url field added to user model

External avatar url can now be set from account settings.
Test added for external avatar url field.
Avatar url now accepts empty string
Empty external avatar url is valid value. If user has empty avatar url then gravatar will be used instead.
Minor code formatting
Merge pull request #278 from ar7em/kandan-176-external-avatar

Custom User Profile Pictures
Fixes #285 latest RoR 3.x and devise changes
Update .travis.yml
Update .travis.yml