Add granular settings widget
Add zone-level granular settings UI
Add cluster-level parameters
Add primary storage-level parameters UI
Add seondary storage-level parameters UI
Add account-level parameter UI
Always maximize detail views with settings tab (to fit listView layout)
CLOUDSTACK-741 - Making storage disable thresholds configurable at zone level.
Add the new configuration items for MidoNet to the database upgrade
script
CLOUDSTACK-2110 : allow vm to have multiple dhcp entries on same router

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1367439056 -0600
CLOUDSTACK-2113:Router VM scale up UI support
CLOUDSTACK-2074: UI - affinity groups - VM wizard under Affinity Groups menu - step 5(select affinity group step) - make corresponding affinity group checked by default.
CLOUDSTACK-2120: mixed zone management - UI - system.js - remove obsolete code that has been replaced with new change in global function createURL().
CLOUDSTACK-2175: Add private Gateway can aonly be done by root or domain admin but not by normal user
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
CLOUDSTACK-2120: mixed zone management - UI - templates.js - remove obsolete code that has been replaced with new change in global function createURL().
CLOUDSTACK-2120: mixed zone management - UI - storage.js - remove obsolete code that has been replaced with new change in global function createURL().
CLOUDSTACK-2120: mixed zone management - UI - instances.js - remove obsolete code that has been replaced with new change in global function createURL().
Merge branch 'master' into ui-granular-settings
CLOUDSTACK-2120: API - mixed zone management - fix a bug that listTemplates/listIsos API didn't take in zoneType properly.