Merge remote-tracking branch 'origin/master'

Conflicts:
	Dev/SocialWebApp/SocialWebApp/SocialWebApp.csproj
Merge remote-tracking branch 'origin/master'