UI > Instance Wizard > Step 4 > correct label from "Data Disk Offering" to "Disk Offering" since selected disk offering here refers to root disk volume when selected template is of ISO format, data disk volume otherwise.
CLOUDSTACK-4950: fix the problem to support sessions to multiple vCenter instance
CLOUDSTACK-4649: UI > Edit Instance, Edit Template > fix a bug that XenServer Tools Version 6.1+ field didn't get updated correctly.
UI > Edit Template, Edit ISO > can't update template/ISO in only one zone. It always get updated in all zones.
Update logo
Move LockMasterListener initialization to earlier in the code

This is not perfect fix but should address 99% of the issues.  The only
time an issue could happen is if something in the bootstrap or system
context tried to lock a row.  Which shouldn't happen at the moment.  If
we find that to be an issue, the LockMasterListener could move to system
context and be inject here.
Make header width 100%; body stays 1024px centered.
Browser widget: Modify behavior

-For better screen real-estate, make all
 browser panes open to full width of content area by default, unless
 partial: true is passed in options

-Remove animation effect, for quicker browsing
Detail view UI: make view all links have hyperlink style
Quickview: Fix positioning
Quickview: Better styling
Merge branch 'asf-master' into ui-restyle

Conflicts:
	ui/scripts/ui/widgets/listView.js