first commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	EF/EF.csproj
	EF/Migrations/201412020336183_Update.Designer.cs