Merge branch 'master' into openid

Conflicts:
	config/locales/is.yml

diff --cc config/locales/en.yml
Simple merge

diff --cc config/locales/is.yml
index 702c182f0c441e77f5d0c9c9edb27f26f1185f74,f16d87a9a125a80c5fbce046799269394e47d037..93e00ed5047b44cedc4bd5462e938ea82966d7e0
--- 1/config/locales/is.yml
--- 2/config/locales/is.yml
+++ b/config/locales/is.yml
@@@ -1047,28 -1080,7 +1082,29 @@@ is
        please login: Vinsamlegast innskráðu þig eða {{create_user_link}}.
        remember: "Muna innskráninguna:"
        title: Innskrá
+       webmaster: vefstjóra
 +      openid_heading: "Innskráning með OpenID:"
 +      username_heading: "Innskráning með OpenStreetMap aðgang:"
 +      openid_logo_alt: "Innskrá með OpenID"
 +      openid_providers:
 +        openid:
 +          title: Innskrá með OpenID slóð
 +          alt: Innskrá með OpenID slóð
 +        yahoo:
 +          title: Innsrká með Yahoo! OpenID
 +          alt: Innsrká með Yahoo! OpenID
 +        google:
 +          title: Innsrká með Google OpenID
 +          alt: Innsrká með Google OpenID
 +        myopenid:
 +          title: Innsrká með myOpenID OpenID
 +          alt: Innsrká með myOpenID OpenID
 +        wordpress:
 +          title: Innsrká með Wordpress.com OpenID
 +          alt: Innsrká með Wordpress.com OpenID
 +        myspace:
 +          title: Innsrká með MySpace OpenID
 +          alt: Innsrká með MySpace OpenID
      logout: 
        heading: Útskrá
        logout_button: Útskrá