Merge branch 'master' of https://github.com/thelia/thelia into coupon

# By Manuel Raynaud (22) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia: (32 commits)
  refactor name for updating actions
  choose UPDATE word for name actions
  add update address action and create tests
  404 not found management
  Working Fix unset namespace
  modify travis script
  test rewriting exception
  Fixed minor bug in Currencies
  Finished currency edition
  Added route methods
  address action implementation
  hot fix
  rewriting
  add address create controller and event
  Added AdminUtilities Smarty plugin, optimized templates
  update customer model createOrUpdate method
  update address model
  fix redirect process in viewListener
  refactor reset_install script
  refactor install process, database management in dedicated class
  ...

Conflicts:
	local/config/schema.xml
	reset_install.sh

reset_install.sh

@@ -15,14 +15,11 @@ echo -e "\n\e[01;34m[INFO] Building Models file\e[00m\n"
 echo -e "\n\e[01;34m[INFO] Building SQL CREATE file\e[00m\n"
 ../../bin/propel sql:build -v --output-dir=../../install/
 
-# Not working : insert manually
-# echo -e "\n\e[01;34m[INFO] Inserting SQL\e[00m\n"
-# ../../bin/propel insert-sql -v --output-dir=../../install/
-# install/thelia.sql
-# install/insert.sql
-echo -e "\n\e[01;34m[INFO] Reinstalling Thelia2\e[00m\n"
-cd ../..
-php Thelia thelia:install --db_host localhost --db_username thelia2 --db_password thelia2 --db_name thelia2
+
+    echo -e "\n\e[01;34m[INFO] Reloaded Thelia2 database\e[00m\n"
+    cd ../..
+    rm install/sqldb.map
+    php Thelia thelia:dev:reloadDB
 
 echo -e "\n\e[01;34m[INFO] Installing fixtures\e[00m\n"
 php install/faker.php