Merge branch 'feature/console' of https://github.com/Thinkscape/zf2 i…

…nto feature/console

Conflicts:
	documentation/manual/en/module_specs/Zend_Mvc-Intro.xml
	documentation/manual/en/module_specs/Zend_Mvc-Services.xml
	documentation/manual/en/module_specs/zend.view.quick-start.xml
	library/Zend/Mvc/Service/ModuleManagerFactory.php
	library/Zend/Text/Table/Table.php

src/CallbackHandler.php

@@ -67,7 +67,7 @@ public function __construct($callback, array $metadata = array())
      * instance, this method will pass the object to a WeakRef instance prior
      * to registering the callback.
      *
-     * @param  callback $callback
+     * @param  callable $callback
      * @return void
      */
     protected function registerCallback($callback)
@@ -115,7 +115,7 @@ protected function registerCallback($callback)
     /**
      * Retrieve registered callback
      *
-     * @return Callback
+     * @return callable
      */
     public function getCallback()
     {