Merge branch 'master' into update_backends

Conflicts:
	src/mist/io/static/js/app/controllers/backends.js
Merge branch 'update_controllers' into update_backends

Conflicts:
	src/mist/io/static/js/app/controllers/backends.js
Fix enabling backend