MVC4
Merge branch 'master' of github.com:yandizheng/QuaintHouse

Conflicts:
	EFPrototype/EFPrototype/EFPrototype.v11.suo