bump acts-as-taggable-on
Remove posts for ignored person
Merge branch '2875-ignore-user-posts' of https://github.com/hpetru/diaspora into hpetru-2875-ignore-user-posts

Conflicts:
	Changelog.md
Add fallback system to frontend I18n system

Load the default locale and fall back to it on missing key
and interpolation errors
Service have been added to /statistics.json

Services have been added to /statistics.json

tidying up

edits
Merge pull request #5120 from jhass/i18n_js_fallback

Add fallback system to frontend I18n system
Remove unused code
Merge pull request #5123 from svbergerem/remove-unused-code

Remove unused code
refactor global event broker and user blocking from stream posts
Terms of service and privacy policy feature.
If enabled, terms of service link will be shown in sign up page.
Rake task for Notifier.admin to send emails to users
Allow sending emails with custom subject via Notifier.admin
Modified behavior of mark all as read button
Rescue from an exception when sending emails in podmin:admin_email
Made wording more clear, refactored read_all
Added the button changing effect + the ability to read all of a type to mobile
Merge pull request #5104 from jaywink/tos

Terms of service and privacy policy feature.
Merge pull request #5111 from jaywink/user-mailer

Rake task to send mails to users
Merge pull request #5121 from wegotcoders/4943-add-services-to-statistics-json

Service have been added to /statistics.json
Merge pull request #5122 from jaideng123/5113-mark-as-read-by-filter

Added Mark all in filter as read feature