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

Conflicts:
	templates/admin/default/currencies.html
Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	templates/admin/default/currencies.html
Merge branch 'master' of https://github.com/thelia/thelia
Added Tools\URL test case, and a test case superclass for initializing
Tools\URL