Merge branch 'hotfix/0.0.2.5'
Merge branch 'release/0.0.3.0'
Include our custom fileuploader on the mobile site too
Merge pull request #3994 from movilla/upload_mobile

Problem with the button to upload images on the mobile interface
move custom splash page login into the controller, fixes #3991
Include reshares in the public user feed, closes #1781
bump selenium-webdriver
Fixed removing images from publisher on the profile and tags pages
Merge pull request #3995 from movilla/delete_upload

Delete images uploaded publisher profile/tags
Merge pull request #3946 from MrZYX/feature/1781-include-reshares-in-user-feed

Include reshares in the public user feed, closes #1781
Wrap text if too long in mobile notifications
Merge pull request #3990 from movilla/mismatch_author_name

Wrap text if too long in mobile notifications
Refactor:
  *people_controller#show
  *photos_controller#index
  *views/people/show both html and mobile
remove inline styles from views/people/show
remove unnecessary code from people_controller#contacts and use #each in view
update changelog
Merge pull request #4002 from marpo60/refactor_people_show

Refactor people show
Sort tag followings alphabetically, not in reverse, fixes #3986
Merge pull request #3997 from MrZYX/reversed_tag_followings

Sort tag followings alphabetically, not in reverse, fixes #3986
update changelog; replace "pre" releases with a plain "head"

Conflicts:
	config/defaults.yml