Merge branch '2.5' into 2.6

* 2.5:
  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