Second part of architecture docs
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/latex/main.pdf
	docs/latex/parts/architecture.tex