Revised schema based on BB discussion.
Merge branch 'master' of github.com:ApexInvesting/ApexInvesting.Platform

Conflicts:
	Common/Common.csproj
	Common/Models/Model.edmx