Merge branch 'hotfix/0.0.2.3'
Stream form on profile page
Merge pull request #3918 from asphxia/3910-stream-form-on-profile-page

Stream form on profile page
ensure our locales are at the bottom of the load path, fixes #2614
Hovering a Timeago-String should show the Timestamp
Merge pull request #3914 from asphxia/3149-timeago-show-timestamp

Hovering a Timeago-String should show the Timestamp
Reshare alert box is appearing twice
do not display the publisher on the profile photos page
update spec to match overriden translation
update feature to match overriden translation
Merge pull request #3844 from asphxia/feature/3672-reshare-alert-box-appearing-twice

Issue #3672: Reshare alert box is appearing twice
Repeated post on stream fails when content is the same
Merge pull request #3947 from asphxia/3272-repeated-post-on-stream

Repeated post on stream fails when content is the same
Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948

From a quick look at the for us available databases this was not actually used in the wild.
Merge branch 'hotfix/0.0.2.4' into develop

Conflicts:
	Changelog.md
	app/views/people/show.html.haml
	config/defaults.yml
	spec/helpers/layout_helper_spec.rb