bump acts-as-taggable-on
Remove posts for ignored person
replaces blue comment box border and box shadow with gray border and no box shadow
revised argument order and changed colors to color variables defined in colors.css.scss
changes border color to dark grey and removes box shadow for textareas and text inputs on focus
Port people search to Bootstrap
Change end year

Changed to 1910. So people like THIS: https://en.wikipedia.org/wiki/Jacque_Fresco#Early_life can actually use Diaspora.
Updated the Galician (gl) translation
Merge pull request #5089 from Gallaecio/develop

Updated the Galician (gl) translation
Merge pull request #5069 from TeamOmniaExtares/bugfix_remove_bootstrap_for_SPV_comments

Bugfix remove bootstrap for spv comments Issue #4425
Merge pull request #5077 from svbergerem/bootstrap-people-search

Port people search to Bootstrap

Conflicts:
	app/assets/stylesheets/application.css.sass
Merge pull request #5083 from theatre-x/patch-3

Change end year
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
Minor edit: Plural s
Merge pull request #5097 from MrFrety/patch-2

Minor edit: Plural s
added keyboard shortcut help topic
corrected english translation
added test for help section keyboard shortcuts