Fixed Build
Merge branch 'master' of https://github.com/StartplatzHackathon/MyFriends

Conflicts:
	MyFriends/MyFriends.csproj