kz - final version for hackday
Merge branch 'master' of github.com:plutino/robopot

Conflicts:
	app/controllers/pot_data_controller.rb
	app/views/pot_data/_cup_gauge.html.erb
	app/views/pot_data/_time_plot.html.erb
	app/views/pot_data/index.html.erb