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'
Merge branch 'master' of https://github.com/thelia/thelia into coupon

# By Etienne Roudeix
# Via Etienne Roudeix
* 'master' of https://github.com/thelia/thelia:
  fix URL::retrieve
  global outputs in loops
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 into coupon

# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less