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

Conflicts:
	templates/default/login.html

templates/default/login.html

@@ -3,8 +3,8 @@
 <h1>{intl l='Please login'}</h1>
 
 {form name="thelia.customer.login" }
-<form action="{url path='/customer/login'}" method="post" {form_enctype form=$form}>
 
+<form action="{url path='/customer/login'}" method="post" {form_enctype form=$form}>
 	{*
 	The field below are not par of the Login form, it defines view to render if the form cannot be validated
 	*}
@@ -17,7 +17,7 @@
 	*}
 
 	{form_field form=$form field='success_url'}
-	<input type="hidden" name="{$name}" value="{$RETURN_TO_URL}" /> {* the url the user is redirected to on login success *}
+	<input type="hidden" name="{$name}" value="{navigate to="return_to"}" /> {* the url the user is redirected to on login success *}
 	{/form_field}
 
 	{*