Merge remote-tracking branch 'origin/1.6' into 1.7

Conflicts:
	doc/sphinx/book/administration.rst
	doc/sphinx/book/app/e-phia/i1.png
	doc/sphinx/book/app/e-phia/i10.png
	doc/sphinx/book/app/e-phia/i12.png
	doc/sphinx/book/app/e-phia/i13.png
	doc/sphinx/book/app/e-phia/i14.png
	doc/sphinx/book/app/e-phia/i2.png
	doc/sphinx/book/app/e-phia/i3.png
	doc/sphinx/book/app/e-phia/i4.png
	doc/sphinx/book/app/e-phia/i5.png
	doc/sphinx/book/app/e-phia/i6.png
	doc/sphinx/book/app/e-phia/i7.png
	doc/sphinx/book/app/e-phia/i8.png
	doc/sphinx/book/app/e-phia/i9.png
	doc/sphinx/book/app/e-phia/index.rst
	doc/sphinx/book/app/e-sophia/i1.png
	doc/sphinx/book/app/e-sophia/i10.png
	doc/sphinx/book/app/e-sophia/i12.png
	doc/sphinx/book/app/e-sophia/i13.png
	doc/sphinx/book/app/e-sophia/i14.png
	doc/sphinx/book/app/e-sophia/i2.png
	doc/sphinx/book/app/e-sophia/i3.png
	doc/sphinx/book/app/e-sophia/i4.png
	doc/sphinx/book/app/e-sophia/i5.png
	doc/sphinx/book/app/e-sophia/i6.png
	doc/sphinx/book/app/e-sophia/i7.png
	doc/sphinx/book/app/e-sophia/i8.png
	doc/sphinx/book/app/e-sophia/i9.png
	doc/sphinx/book/app/e-sophia/index.rst
	doc/sphinx/book/app/e_sophia/i1.png
	doc/sphinx/book/app/e_sophia/i10.png
	doc/sphinx/book/app/e_sophia/i12.png
	doc/sphinx/book/app/e_sophia/i13.png
	doc/sphinx/book/app/e_sophia/i14.png
	doc/sphinx/book/app/e_sophia/i2.png
	doc/sphinx/book/app/e_sophia/i3.png
	doc/sphinx/book/app/e_sophia/i4.png
	doc/sphinx/book/app/e_sophia/i5.png
	doc/sphinx/book/app/e_sophia/i6.png
	doc/sphinx/book/app/e_sophia/i7.png
	doc/sphinx/book/app/e_sophia/i8.png
	doc/sphinx/book/app/e_sophia/i9.png
	doc/sphinx/book/app/e_sophia/index.rst
	doc/sphinx/book/index.rst