update WAML
Merge'
Fix merging issues
Update hydra.xml
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	src/ComputeManagement/packages.config
merge
Update generated wrappers
Merge pull request #484 from andrerod/dev

Update wrappers
Merge pull request #485 from WindowsAzure/dev

Merge dev into master