bump acts-as-taggable-on, closes #5228, #5234
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
Fixed typo

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

Fixed typo
Fix XSS issue in poll questions

closes #5274
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
XMPP diaspora chat feature

open tasks:
* mixed content; writing reverse proxy for rails application?!
* design tweaks (smiles are broken)
* login with user credentials from external (authentication works; something else broken?!)
* pod federation (was not tested yet)
* make jappix text translatable
* history / offline messages (we probably want that?!)

Vines is located here zauberstuhl/diaspora-vines
Jappix is located here zauberstuhl/bower-jappix-mini
Removed obsolete files and configured default values
Workaround for unknown function in production mode
Fails cause I am using a token system
Removed vines cert directory
Added database provider for AppConfig
Vine tweaks for v0.1.1
Added cert and key config for chat encryption
Updated vines to version 0.1.1