returning customer login. closes #3903
Fix error with admin translations not loading
Merge remote-tracking branch 'upstream/master' into estonian-translation