Typo (sorry Etienne)
Merge branch 'master' of https://github.com/thelia/thelia
Working : Major class changes migration from bootstrap 2.x to 3.0
global outputs in loops
Merge branch 'rewrite'
Working : Finish renaming class for bootstrap migration
fix URL::retrieve
Working : Cleanup admin new version bootstrap v3
Merge branch 'bootstrap3'
Event harmonization with MRA
Working : Fix script reset
WIP : Comment of route url-rewriting.check
Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	reset_install.sh
Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Config.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Tools/URL.php
Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/css/admin.less
	templates/admin/default/currencies.html
	templates/admin/default/general_error.html
	templates/admin/default/messages.html
	templates/admin/default/variables.html
Merge branch 'master' of github.com:thelia/thelia

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml