Bugs solved
Merge branch 'dev' of https://github.com/frco9/ecobox into dev

Conflicts:
	app/controllers/sensors_controller.rb
	app/views/sensors/show.html.erb
	db/schema.rb