stuff
Merge branch 'master' of https://github.com/KTH-haninge-project/community

Conflicts:
	Community/Community/Community.csproj