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
Fix New-AzureVM issue
fix os virtual disk mapping
Addin VM Template test cases
Merge pull request #5 from huangpf/template

Fix Export/Import/New-AzureVM
Added scenario test for resources
Change -ParentResourceName to -ParentResource for New/Set/Get/Remove-AzureResource (1416968)
update help for vm/os images
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools-pr into dev
Merge pull request #6 from huangpf/template

update help for vm/os images
Merge pull request #401 from stankovski/parent-resource

Change -ParentResourceName to -ParentResource for New/Set/Get/Remove-AzureResource (1416968)
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 testing
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools-pr into dev
Fix image related cmdlets
Merge pull request #7 from huangpf/template

Fix image related cmdlets