update compute package
Add IconUri & SmallIconUri & ShowInGui params to AddAzureVMImage cmdlet
Retry on conflict error
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
update test for add-azurevmimage
Merge branch 'dev' of https://github.com/AzureRT/azure-powershell into dev
Merge branch 'dev' of https://github.com/AzureRT/azure-powershell into dev
Merge pull request #2 from huangpf/dev

AzureRT S42 PR #2
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev

Conflicts:
	src/ServiceManagement/Network/Commands.Network.Test/packages.config
Merge pull request #35 from AzureRT/dev

AzureRT S42 PR #2