Merge remote-tracking branch 'Budget/GMY'

Conflicts:
	Budget/Budget.csproj
	Budget/Views/Company/Index.cshtml
	Entity/Entity.csproj
Merge remote-tracking branch 'Budget/GMY'

Conflicts:
	Budget/Budget.csproj
	Budget/Views/Company/Index.cshtml
	Entity/Entity.csproj
Merge remote-tracking branch 'origin/master'

Conflicts:
	Budget/Budget.csproj
	Budget/Views/Shared/_Layout.cshtml
	EF/EF.csproj
	EF/Migrations/201412050339421_udpate.Designer.cs