Add Flowdock notification adapter
Update *from* email to display a valid Flowdock avatar
Flowdock doesn't validate or have some sort of confirmation for email addresses. As long as you know Flow API token you're free to post with any email.
extract Fingerprint#generate from ErrorReport
Merge pull request #253 from concordia-publishing-house/extract-fingerprint

Refactor: extract Fingerprint#generate from ErrorReport
Merge pull request #508 from shingara/features/merge_comment_too

Merge comment with problem during the merge of some problem
Upgrade to Devise 2.2.x version

The Devise version was old so we upgrade to the latest version
Merge branch 'features/update_devise'
udpate changelog [ci skip]
update hipchat gem
update some gem and dev gem [ci skip]
Extract I18n key from views/layouts/application.html.haml
Extract translation key on navigation and session bar
Merge pull request #504 from nfedyashev/flowdock_notification_adapter

Conflicts:
	Gemfile.lock
Tell to run bundle in the Heroku deploy instructions

Without running first `bundle` I get the following error when running `heroku config:add SECRET_TOKEN="$(bundle exec rake secret)"`

/Users/florent2/.rbenv/versions/2.0.0-p0/lib/ruby/gems/2.0.0/gems/bundler-1.3.5/lib/bundler/spec_set.rb:92:in `block in materialize': Could not find i18n-0.6.1 in any of the sources (Bundler::GemNotFound)
Merge pull request #513 from Florent2/patch-1

Tell to run `bundle` in the Heroku deploy instructions
Treat message as CDATA to avoid invalid XML
Properly escape backtrace attributes to avoid invalid XML
Merge pull request #514 from mildavw/master

fix for notifier.js sending invalid XML
Merge pull request #517 from roryf/master

Fixes notifier.js sending invalid XML in backtrace lines
update changelog with new Pull request merge [ci-skip]