Remove unused rake tasks, make cumber rake file the vanilla one
Merge branch 'release/0.0.1.0' into develop
post release version bump [ci skip]
Edit Profile issue with misaligned elements - Fix 3599
Merge pull request #3635 from movilla/fix_checkbox_select_profiles

Edit Profile issue with misaligned elements - Fix #3599
Aspect dropdown on welcome page (after signup) - overflow hidden - fix 3604
facebox invitations top on left - outerWidth fail
Merge pull request #3637 from movilla/dropdown_welcome_page

Aspect dropdown on welcome page (after signup) - overflow hidden - Fix #3604 [ci skip]
Merge pull request #3638 from movilla/facebox_fix_width

Facebox invitations top on left - outerWidth fail! [ci skip]
Merge branch 'hotfix/0.0.1.1' into develop

Conflicts:
	Changelog.md
	config/defaults.yml
Fix "if display_password_reset_link?" when diaspora.yml => enable_registrations: false
Merge pull request #3649 from movilla/display_registration

Fix "if display_password_reset_link?" when diaspora.yml => enable_registrations: false
replace the monstrous link regex with a slightly less complicated one,
based on the one from the markdown parser, fixes #3553
adding a list of urls for testing the regex in the specs
adds password_confirmation field to registration page
redirect users back on registration failure
update changelog
Change 'unless' to 'if' because 'unless' is wrong here.
Merge pull request #3647 from marpo60/3636-adds-password-confirmation-field

adds password_confirmation field to registration page
make Changelog an unorderdd list for now, we need to work out a consistent style for that [ci skip]
Fix problem javascript with read-unread notifications on notifications popup