Merge remote-tracking branch 'origin/master' into track-address-reference-update

src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php

@@ -274,7 +274,7 @@ class Configuration implements ConfigurationInterface
             ->end()
             ->end() // end of root/children
             ->end() // end of root
-;
+        ;
 
         $rootNode->children()
             ->arrayNode('add_address')->addDefaultsIfNotSet()->children()

src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php

@@ -211,7 +211,7 @@ trait AddWidgetConfigurationTrait
      *
      * @throws InvalidConfigurationException if a service's tag does not have the "alias" key
      *
-     * @return type
+     * @return array
      */
     protected function getWidgetAliasesbyPlace($place, ContainerBuilder $containerBuilder)
     {