Local commit to cache changes
Merge branch 'AAD'

Conflicts:
	samples/OAuthClient/OAuthClient.csproj
	samples/OAuthClient/Web.config
	src/DotNetOpenAuth.sln
	src/packages/repositories.config