fix netmount volume insertion (do append)
add a root option 'icon' for volume root icon (value is icon URL)
Merge branch '2.x' into 2.x_n
Merge branch 'volume_icon' into 2.x_n

Conflicts:
	js/ui/tree.js