work in progress - menu
Merge branch 'freebsd10' of gitserver.ixsystems.com:repos/freenas-build/freenas into freebsd10

Conflicts:
	src/gui/app/jsx/views/FreeNASWebApp.js
	src/gui/app/source/styles/structure.less