Implementing translations (still in progress)
Merge branch 'master' of https://github.com/thelia/thelia

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