Fix message sender pastie link
Merge pull request #65 from mguinada/fix-pastie

Fix message sender pastie link
Create gen-changelog.sh
fixed the global scroll
Merge branch 'master' of https://github.com/kandanapp/kandan
fixed that weird gap that shows when the chat area is scrolled all the way to the top
added space at bottom of sass file to see if the \no new line thing would go away
added one more line
one more line
fixed all the weird spacing issues.
Merge pull request #66 from SpencerCooley/master

Fixed the global scroll issue
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