Merge branch 'doc/#2-method-annotation-helper-mismatch' into develop

Close #2
Forward port #2

Author: Ocramius

src/Controller/AbstractController.php

@@ -41,7 +41,7 @@
  * @method \Zend\Mvc\Controller\Plugin\Redirect redirect()
  * @method \Zend\Mvc\Controller\Plugin\Url url()
  * @method \Zend\View\Model\ConsoleModel createConsoleNotFoundModel()
- * @method \Zend\View\Model\ViewModel createHttpNotFoundModel()
+ * @method \Zend\View\Model\ViewModel createHttpNotFoundModel(Response $response)
  */
 abstract class AbstractController implements
     Dispatchable,