fix bug
fix bug
adds
Merge remote-tracking branch 'origin/GMY_TS' into milk

Conflicts:
	EF/Migrations/201310280638099_initial.Designer.cs
	EF/Migrations/201310280638099_initial.cs
	EF/Migrations/201310290829298_Initial.Designer.cs
	EF/Migrations/201310290829298_Initial.cs
	EF/Migrations/201310310201457_initial.Designer.cs
	EF/Migrations/201310310201457_initial.cs
fix bug