added timestamp parameter to format_date sparty plugin
Merge branch 'catalog'

Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php