Merge branch 'reshare-notification'

app/helpers/notifications_helper.rb

app/mailers/notifier.rb

app/models/job/mail/reshared.rb

app/models/job/receive_local_batch.rb

app/models/notification.rb

app/models/notifications/also_commented.rb

app/models/notifications/comment_on_post.rb

app/models/notifications/liked.rb

app/models/notifications/mentioned.rb

app/models/notifications/reshared.rb

app/models/reshare.rb

app/models/user_preference.rb

app/views/notifier/reshared.html.haml

app/views/notifier/reshared.text.haml

app/views/users/edit.html.haml

config/locales/diaspora/en.yml

features/notifications.feature

features/reshare.feature

features/step_definitions/user_steps.rb

spec/factories.rb