Merge branch '2.7'

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

Author: weaverryan