Merge branch 'master' into remoni.graphs

Conflicts:
	src/mist/io/static/js/app/views/monitoring.js