move settings back to enum but with custom serialization to comply with JSON
Merge pull request #746 from stankovski/master

Added support to ARM Deployments to send template via payload (2012037)
Update wrappers
Bump versions
merge
fix merge
Merge pull request #747 from andrerod/master

Update wrappers
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-net into dev
bump version
Update scheduler wrappers
Update assembly infos
Merge pull request #750 from andrerod/master

Update scheduler wrappers
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-net into dev

Conflicts:
	src/WebSiteManagement/Properties/AssemblyInfo.cs
Merge pull request #749 from galcho/dev

move settings back to enum but with custom serialization to comply with JSON
Upgraded to JSON 6.0.4
Removed duplicate reference to JSON assembly
Removed duplicate reference to JSON
Updated packages to JSON 6.0.4
Merge branch 'master' of https://github.com/WindowsAzure/azure-sdk-for-net into json604

Conflicts:
	src/SchedulerManagement/packages.config
	src/WebSiteManagement/packages.config
Merge pull request #751 from stankovski/json604

Upgrade to JSON 6.0.4 (1661720)