Fixed error in user page template.
Updated messages.pot
Grammar fixes.
Merge branch 'master' into lang-switch
Updated messages.pot