Adding support for multiple ACS endpoints
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-media-services into dev
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-media-services into dev

Conflicts:
	src/net/Client/CloudMediaContext.cs
	src/net/Client/OAuth/OAuthDataServiceAdapter.cs
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-media-services into dev
merge from dev branch
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-media-services into dev
Change to use the ACS token expiration instead of expiresIn property of the ACS response
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-media-services into dev

Conflicts:
	src/net/Client/MediaServicesCredentials.cs
	src/net/Client/StringTable.resx
Readme.md update from merge