Menu component + animation
Conflict solving
Merge branch 'freebsd10' of gitserver.ixsystems.com:repos/freenas-build/freenas into freebsd10