Added ability to authenticate by authenticity token, needed for compatibility with hubot.

Conflicts:
	app/controllers/application_controller.rb
Complete security overhaul on the application due to possible attack vectors
Merge pull request #346 from alfajango/hubot-authenticity-token

Added ability to authenticate by authenticity token, needed for compatibility with hubot.
Merge pull request #347 from scouttyg/security-overhaul

Complete security overhaul on the application due to possible attack vec...
Update channel.rb

This fixes the bootstap rake task, which errors to 
`Can't mass assign protected attribute: user`
Merge pull request #348 from jonathanronen/patch-1

Update channel.rb to include attr_accessible for :user
Merge branch 'master' of github.com:kandanapp/kandan