Tries to prevent concurrency error on beehive updates
Tries to prevent concurrency error on beehive updates

Conflicts:
	app/controllers/backend/beehives_controller.rb

ekylibre/ekylibre,ekylibre/ekylibre,ekylibre/ekylibre,ekylibre/ekylibre,ekylibre/ekylibre