brash
Merge branch 'master' of github.com:EgorkZe/bh

Conflicts:
	app/controllers/sensors_controller.rb