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
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
fix XSS vulnerability in conversations#new, closes #4010
Add the ability to upload photos from the mobile site
Merge pull request #4004 from movilla/upload_photo

Upload photo mobile. Close #3324
fix css and js error with upload photo mobile
Merge pull request #4015 from movilla/upload_photo_1

Fix css and js error with upload photo mobile
delegate parent_author to the target of a RelayableRetraction
add integration spec for retracting a comment
bundler should communicate with rubygems using ssl
Merge pull request #4018 from instrumentio/feature/bundler

bundler should communicate with rubygems using ssl