commit
commit
c
Merge branch 'origin/master'

Conflicts:
	bin/AWS.SessionProvider.dll
	bin/AWSSDK.dll
	bin/Microsoft.Web.Infrastructure.dll
	bin/Newtonsoft.Json.dll
	bin/Newtonsoft.Json.xml