Merge branch '2.3' into 2.5

* 2.3:
  Fixing build error
  Big update based on feedback from xabbuh and WouterJ
  Moving forwarding section all the way to the bottom
  Completely re-reading the controller chapter

Conflicts:
	book/controller.rst

Author: weaverryan