Merge remote-tracking branch 'Budget/GMY'

Conflicts:
	Budget/Budget.csproj
	Budget/Views/Company/Index.cshtml
	Entity/Entity.csproj