Merge branch 'master' of https://github.com/runinspring/egretJeffClass

Conflicts:
	mvc/source/Facade.ts