fixed the autoscroll problem
Merge branch 'master' of https://github.com/kandanapp/kandan
took out rb-readline, fixed autoscroll for client. Still needs autscroll on push event.
Merge pull request #67 from SpencerCooley/master

took out the rb-readline gem
Clean up actions
Updated rails so we don't get bitten by the JSON bug.

CVE-2013-0276
CVE-2013-0277

http://weblog.rubyonrails.org/2013/2/11/SEC-ANN-Rails-3-2-12-3-1-11-and-2-3-17-have-been-released/
Updated rails so we don't get bitten by the JSON bug.
  CVE-2013-0276
  CVE-2013-0277

  http://weblog.rubyonrails.org/2013/2/11/SEC-ANN-Rails-3-2-12-3-1-11-and-2-3-17-have-been-released/

Merge branch 'master' of https://github.com/kandanapp/kandan

Conflicts:
	Gemfile.lock
Merge pull request #68 from sergii/cleanup_actions

Clean up actions
Added real emoticons to emoticons plugin.

- Added underscore.string to dependecies
Merge branch 'master' of https://github.com/kandanapp/kandan
Merge pull request #71 from gabceb/master

Added real emoticons to emoticons plugin
Added vimeo plugin
Removed unnecessary dummy thumb url
Merge pull request #73 from gabceb/master

Vimeo plugin
Updated file drop to latest version work with latest jquery where live is deprecated
Merge pull request #74 from gabceb/master

Updated filedrop to latest version
Fixed references to some emoticons. Added GTFO emoticon image
Merge pull request #80 from gabceb/master

Fixed references to some emoticons. Added GTFO emoticon image
Added dummy deleted user to be used when a message associated with a user that has been deleted is shown
Added logger to development env for Thin server