bump acts-as-taggable-on
Remove posts for ignored person
Clarify explanations and defaults in diaspora.yml.example
Removed stats hub address, other minor tweaks
Revert so defaults are now placed in commented out settings
Merge pull request #5088 from goobertron/defaults

Clarify explanations and defaults in diaspora.yml.example
Change default for jQuery CDN to false.
Set top margin only on the body element
Merge pull request #5108 from blase/feature/5107-set-top-margin-on-body

Set top margin only on the body element
Poll answers are added dynamically on keypress

Removed add option button

poll option can be added dynamically & last option removed if empty upon submission

Poll answer can be added dynamically by losing focus

poll option can be added dynamically & last option removed if empty upon submission

refractored to avoid repetition of publisher:sync event

poll option can be added dynamically & last option removed if empty upon submission

Added a missing semicolon
Merge branch '2875-ignore-user-posts' of https://github.com/hpetru/diaspora into hpetru-2875-ignore-user-posts

Conflicts:
	Changelog.md
Ignoring validation for last poll answer input

last input field is only deleted if there are more than three input fields and the last one is empty

poll is validated only if the last input is empty, and the first three have been filled

Removed duplicate remove last answer.

Dont need to check that the last value is populated as we are ignoring last value

Fixing poll step

Placeholder text edited

Fixed translations for poll answer placeholder text

Removed numbers on publisher option

Removed numbers in placeholder for poll answers
Merge pull request #5109 from wegotcoders/4886-auto-add-poll-answer

4886 auto add poll answer
user account edit page fully ported to bootstrap
profile edit page ported to bootstrap
privacy settings page ported to bootstrap
services edit page ported to bootstrap
:only keyword added to the layout calls
Narrower content for settings pages (2/3 of available width).
profile birthday proportional selects (using responsive classes)