Merge remote-tracking branch 'origin/MoreIM' into milk

Conflicts:
	EF/Migrations/201402270422384_addupd.Designer.cs
	EF/Migrations/201402270629240_Initail.Designer.cs
	EF/Migrations/201402280709322_update.Designer.cs
	EF/Migrations/201402280709322_update.cs
	EF/Migrations/201403030224500_adds.Designer.cs