com
Merge branch 'master' of https://github.com/lrzw32/Learn

Conflicts:
	WebTest/Scripts/_references.js
LearnEF
LearnEF
Merge branch 'master' of https://github.com/lrzw32/Learn