Merge branch 'dev' of https://github.com/brooklyngwdev/azure-sdk-for-net
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-net
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
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)
Upgraded all client packages to Common version 1.3.0
Updated Microsoft.WindowsAzure.Management.Libraries package
Fix for WP8.1 build configuration
Updated Microsoft.WindowsAzure.Management.Libraries
Merge pull request #752 from stankovski/json604

Update of Management Libraries to use new Common package with JSON 6.0.4 (1661720)
Renamed Windows Azure to Microsoft Azure
Merge pull request #753 from stankovski/rename

Renamed Windows Azure to Microsoft Azure