Merge branch 'master' of github.com:diaspora/diaspora into fb

Conflicts: app/views/layouts/application.html.haml app/views/shared/_publisher.haml app/views/shared/_sub_header.haml app/views/users/edit.html.haml config/deploy_config.yml config/routes.rb

Merge branch 'master' of github.com:diaspora/diaspora into fb
08b9aa86 · ilya · f38bcc9e · 8f55852e · 08b9aa86 · 08b9aa86
--- a/config/locales/devise.es.yml
+++ b/config/locales/devise.es.yml
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
--- a/config/locales/devise/devise.fr-informal.yml
+++ b/config/locales/devise/devise.fr-informal.yml
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
--- a/config/locales/devise.it.yml
+++ b/config/locales/devise.it.yml
--- a/config/locales/devise.lt.yml
+++ b/config/locales/devise.lt.yml
--- a/config/locales/devise.pl.yml
+++ b/config/locales/devise.pl.yml
--- a/config/locales/devise.pt-BR.yml
+++ b/config/locales/devise.pt-BR.yml
--- a/config/locales/devise.pt-PT.yml
+++ b/config/locales/devise.pt-PT.yml
--- a/config/locales/devise/devise.ro.yml
+++ b/config/locales/devise/devise.ro.yml
--- a/config/locales/devise.ru.yml
+++ b/config/locales/devise.ru.yml
--- a/config/locales/devise.sv.yml
+++ b/config/locales/devise.sv.yml
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
--- a/config/locales/diaspora/fr-informal.yml
+++ b/config/locales/diaspora/fr-informal.yml