csproj
Merge branch 'master' of https://github.com/felixmc/bromance

Conflicts:
	Bros/Bros.csproj
modified entities to be ready for db generation
merging..hopefully