Merge branch 'master' into nem468a.

Many tweaks to fix some issues with tree, labels and Inspector.

Conflicts:
	platform/commonUI/edit/res/templates/elements.html
	platform/commonUI/general/res/sass/search/_search.scss
	platform/commonUI/general/res/sass/tree/_tree.scss
	platform/commonUI/general/res/templates/object-inspector.html
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
	platform/search/res/templates/search.html

platform/commonUI/general/res/sass/_mixins.scss

@@ -306,7 +306,7 @@
 	@include desktop {
 		@if $bgHov != none {
 			&:not(.disabled):hover {
-				background: $bgHov;
+				@include background-image($bgHov);
 				>.icon {
 					color: lighten($ic, $ltGamma);
 				}