Signed-off-by: yandizheng <yandi.zheng@gmail.com>
Merge branch 'master' of https://github.com/yandizheng/QuaintHouse.git

Conflicts:
	EFPrototype/EFPrototype/EFPrototype.v11.suo
	EFPrototype/EFPrototype/PrototypeSite/App_Data/QuaintHouseShopDb.mdf
	EFPrototype/EFPrototype/PrototypeSite/App_Data/QuaintHouseShopDb_log.ldf
Merge branch 'master' of https://github.com/yandizheng/QuaintHouse.git

Conflicts:
	EFPrototype/EFPrototype/EFPrototype.v11.suo
Signed-off-by: yandizheng <yandi.zheng@gmail.com>
Merge branch 'master' of https://github.com/yandizheng/QuaintHouse.git
Signed-off-by: yandizheng <yandi.zheng@gmail.com>
Merge branch 'master' of https://github.com/yandizheng/QuaintHouse.git

Conflicts:
	EFPrototype/EFPrototype/EFPrototype.v11.suo