Use cached histograms and merge new values
Merge only changes into cached histograms to prevent flickering
Merge branch 'master' of git@github.com:tgrk/statman_elli.git into merging_histograms

Conflicts:
	priv/docroot/controllers.js