locale switcher template update
Merge branch 'master' of github.com:sjopet/CoreBundle