Merge branch 'hotfix/0.0.2.5'
Merge branch 'release/0.0.3.0'
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
exec foreman in script/server
Include our custom fileuploader on the mobile site too
move custom splash page login into the controller, fixes #3991
Fixed removing images from publisher on the profile and tags pages
Wrap text if too long in mobile notifications

Conflicts:
	Changelog.md
Sort tag followings alphabetically, not in reverse, fixes #3986
release 0.0.3.1
Merge branch 'hotfix/0.0.3.1' into develop

Conflicts:
	Changelog.md
	config/defaults.yml
avoid posting empty comments

fix Jasmine test

updated changelog with bugfix #3836

fix changelog update

remove wrong bug fix line
Merge pull request #4008 from pestrada/3836-avoid-empty-comments

avoid posting empty comments