Fix 2.5->2.7
Finish 1.7
Merge branch 'alex'

Conflicts:
	main.tex