move settings back to enum but with custom serialization to comply with JSON
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-net into dev
bump version
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