csproj
Merge branch 'master' of https://github.com/aelex91/FacebookBlocket

Conflicts:
	BlocketProject/BlocketProject/BlocketProject.csproj