added field locale to $_SESSION
Merge branch 'origin/master'