From ff4f3be64dc30075d848509af8937986cff561af Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Sun, 8 Sep 2013 12:29:20 +0200
Subject: [PATCH 1/2] Added windows version of reset_install script

---
 reset_install.bat | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 reset_install.bat

diff --git a/reset_install.bat b/reset_install.bat
new file mode 100644
index 000000000..d117e525b
--- /dev/null
+++ b/reset_install.bat
@@ -0,0 +1,35 @@
+echo off
+REM @author Guillaume MOREL
+REM v0.1
+
+echo [WARN] This script will reset this Thelia2 install
+
+if exist local\config\database.yml (
+    echo [INFO] Downloading vendors
+    composer install --prefer-dist
+
+    cd local\config\
+
+    echo [INFO] Building Models file
+    ..\..\bin\propel build -v --output-dir=../../core/lib/
+
+    echo [INFO] Building SQL CREATE file
+    ..\..\bin\propel sql:build -v --output-dir=../../install/
+
+
+    echo [INFO] Reloaded Thelia2 database
+    cd ..\..
+    del install\sqldb.map
+    php Thelia thelia:dev:reloadDB
+
+    echo [INFO] Installing fixtures
+    php install\faker.php
+
+    echo [INFO] Adding admin
+    php Thelia thelia:create-admin
+
+    echo [SUCCESS] Reset done
+)
+) else (
+    echo [FAILED] Please add your database informations in local\config\database.yml and start this script again.
+)
\ No newline at end of file

From b637ad79f438ffb8a3c6a0b045320971be2bfb33 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Mon, 9 Sep 2013 08:05:43 +0200
Subject: [PATCH 2/2] fix phpdoc

---
 .../Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
index a65e15a8e..e9c91b7df 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
@@ -293,13 +293,11 @@ class TheliaLoop extends AbstractSmartyPlugin
     }
 
     /**
+     * @param $smartyParams
      *
-     * find the loop class with his name and construct an instance of this class
-     *
-     * @param  string                                 $name
-     * @return \Thelia\Core\Template\Element\BaseLoop
-     * @throws InvalidElementException
-     * @throws ElementNotFoundException
+     * @return object
+     * @throws \Thelia\Core\Template\Element\Exception\InvalidElementException
+     * @throws \Thelia\Core\Template\Element\Exception\ElementNotFoundException
      */
     protected function createLoopInstance($smartyParams)
     {