Fixed all of Dan's breakage
Merge remote-tracking branch 'origin/Chris'

Conflicts:
	StocksWithFriends/StocksWithFriends/Controllers/FacebookController.cs
	StocksWithFriends/StocksWithFriends/StocksWithFriends.csproj
	StocksWithFriends/StocksWithFriends/Views/Facebook/AddFriend.cshtml
	StocksWithFriends/StocksWithFriends/Views/Shared/_Layout.cshtml