move lang to locale for seo titles
Merge branch 'master' into milestone/publify-8

Conflicts:
	app/views/admin/seo/titles.html.erb