Merge pull request #2925 from rubenrua/2.0.x

Fix PHPDoc GroupInterface::getId

Author: XWB

Model/GroupInterface.php

@@ -25,7 +25,7 @@ interface GroupInterface
     public function addRole($role);
 
     /**
-     * @return int
+     * @return mixed
      */
     public function getId();