Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools-pr into dev
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools-pr into deployment-name

Conflicts:
	WindowsAzurePowershell/src/Commands.ResourceManager/Models/ResourceClient.ResourceManager.cs
Merge pull request #394 from stankovski/log

Removed -LastDeployment parameter from Get-AzureResourceGroupLog (1413065)
Disabled patch in Set-AzureResource (1414327)
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools-pr into dev
Updated unit tests removing merge tests
update wxi
Merge branch 'dev' of https://github.com/AzureRT/azure-sdk-tools-pr into dev
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools-pr into dev
update wxi
Merge pull request #396 from stankovski/deployment-name

Use the template file name (without file extension) as the default deployment name rather than a GUID (1413294)
Merge pull request #398 from stankovski/dev

Disabled patch in Set-AzureResource (1414327)
Merge branch 'dev' of https://github.com/AzureRT/azure-sdk-tools-pr into azurert
Merge branch 'azurert' of https://github.com/huangpf/azure-sdk-tools-pr into template

Conflicts:
	WindowsAzurePowershell/setup/azurecmdfiles.wxi
Save-AzureResourceGroupGalleryTemplate DCRs
Merge branch 'dev' of github.com:WindowsAzure/azure-sdk-tools-pr into dp

Conflicts:
	WindowsAzurePowershell/src/Commands.ResourceManager/Properties/Resources.Designer.cs
	WindowsAzurePowershell/src/Commands.ResourceManager/Properties/Resources.resx
address pr
Merge pull request #1 from huangpf/template

VM Image, CS Extension, and Get-AzureVM Cmdlets Update
Merge pull request #399 from ogail/dp

Save-AzureResourceGroupGalleryTemplate DCRs
Change publisher for CS extension