Merge documentation from tx_branch
Merge branch 'master' into feature/refactor

* master:
  Merge documentation from tx_branch
Merge documentation from tx_branch
Merge branch 'master' into feature/refactor

* master:
  Merge documentation from tx_branch

Conflicts:
	doc/paper.pdf
	doc/paper.tex
	documentation/revision.tex