Update Ch7framework.tex
Update Ch2context.tex
Update Ch7framework.tex
Update Ch7framework.tex
Merge remote-tracking branch 'wzd/master'
Merge remote-tracking branch 'wzd/patch-1'
Merge remote-tracking branch 'wzd/patch-2'

Conflicts:
	Ch2context.tex