bump acts-as-taggable-on, closes #5228, #5234
Notifications Dropdown now infinite scrolls
Replaced punycode.js vendored asset with a bower package #5194
Merge pull request #5263 from strivedi183/5194-replace_punycodejs_vendored_asset_with_bower_package

Replaced punycode.js vendored asset with a bower package #5194
Redesign profile page and port to Bootstrap
Fixed typo

From "Seams" to "Seems"
Merge pull request #5265 from theatre-x/patch-6

Fixed typo
moved hoverable class from <li> to <a>
Fix XSS issue in poll questions

closes #5274
Merge branch 'hotfix/0.4.1.1'
Merge branch 'hotfix/0.4.1.1' into develop

Conflicts:
	Changelog.md
	config/defaults.yml
Fix services in statistics.json.
Currently there is a bug in configurate that reports incorrectly the services settings if they are set as ENV variables, instead of diaspora.yml settings.
This commit works around that issue by changing the way the setting is fetched.
Fix statistics_presenter_spec
Merge pull request #5256 from jaywink/fix-services-statistics

Fix services in statistics.json.
Reset dynamic configuration after each example in the testsuite
Hidden overflow for long names on tag pages
Moved services to a JSON list.
Added AppConfig.privacy.statistics.deprecated_format to toggle showing the old style format.
Removed setting for statistics, showing both instead.
Added classes to the body for easier page specific styling.
Merge pull request #4657 from svbergerem/bootstrap-people-view

Redesign profile page and port to Bootstrap