Need a Gemfile.lock for deployment
manual merge the master branch
manually merged Gemfile.lock
Manual merge during sanger update
Merge remote-tracking branch 'sanger/master'
manual merge during update development
Merge remote-tracking branch 'sanger/master'
Merge remote-tracking branch 'sanger/master'
Merge remote-tracking branch 'sanger/master'
Merge remote-tracking branch 'sanger/master'
Merge remote-tracking branch 'sanger/master'
[fix #48160213] downgrade bunny gem to 0.8.0 version
Merge pull request #144 from ke4/master_48160213_downgrade_bunny_gem_to_the_latest_stabil_version__0_8_0__

Master 48160213 downgrade bunny gem to the latest stabil version  0 8 0
[fix #48240295] set heartbeat value of RabbitMQ/bunny
[fix #48160213] downgrade bunny gem to 0.8.0 version
bump the version number to 1.2.2
revert back to bunny 0.9.0.pre4
Merge branch 'master_bunny0_9_with_heartbeat_0' of git://github.com/ke4/lims-api into ke4-master_bunny0_9_with_heartbeat_0

Conflicts:
	Gemfile.lock
	lib/lims-api/version.rb
revert back to bunny 0.9.0
Merge pull request #146 from sanger/master_heartbeat_0

revert back to bunny 0.9.0