Merge branch 'master' into ui-vm-affinity

Conflicts:
	ui/scripts/instances.js
CLOUDSTACK-2120: mixed zone management - (1) extend listStoragePools API to to take in zonetype. (2) UI: populate Primary Storages list page with ones whose zonetype matches selected option in zone type dropdown on top menu.
Add icon for 'change affinity' action
Add icons for 'add account,' 'release from account'
CLOUDSTACK-2138 : add ca, de_DE, it_IT ja, koçKR,nb_NO pt_BR, ru_RU resource files for UI with ASCII with unicode encoding. (Merging for 4.1/Transifex, sync with transifex), add some languages in combo list on login page on UI
CLOUDSTACK-2138 : add ca, de_DE, it_IT ja, koçKR,nb_NO pt_BR, ru_RU resource files for UI with ASCII with unicode encoding. (Merging for 4.1/Transifex, sync with transifex), add some languages in combo list on login page on UI
CLOUDSTACK-2138: fix an issue on JA (japanese) resource file
Revert "CLOUDSTACK-2138: fix an issue on JA (japanese) resource file"

This reverts commit 26029f0a268cf509b82b5b07ded0bc46b29bdb1b.
CLOUDSTACK-2138: fix an issue on JA (japanese) resource file. Add ES (spanish) resource file
fix copy/paste bug
Summary: Don't add secondary storage to KVM heartbeat

BUG-ID: CLOUDSTACK-2173
Bugfix-for: 4.2
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1366865750 -0600
CLOUDSTACK-1567
fix CLOUDSTACK-2157 On VMWare ESXi host deployment: Expunged VMs are not getting cleaned up from the host
remove a debug log in vmwareResource
CLOUDSTACK-1903:Delete event/alerts date parameter handling
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Update the chinese (zh_CN) resource file for Web UI. 100% translate. Thanks to Gavin Lee.
CLOUDSTACK-1573 listNics response update for not showing vlan to normal user
CLOUDSTACK-1741 Added ip uuid into the AddIptoVmNicCmd response

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
add lang key for Catalan, German, Italian, Norwegian. (from 4.1 branch)