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

Conflicts:
	EF/Migrations/201311020458441_initial.cs
	EF/Migrations/201311020458441_initial.resx
	EF/Migrations/201311040343416_Initial.Designer.cs
	EF/Migrations/201311040343416_Initial.cs
	EF/Migrations/201311040343416_Initial.resx
	EF/Migrations/201311040627461_initial.Designer.cs
	EF/Migrations/201311040627461_initial.cs
	EF/Migrations/201311040627461_initial.resx