Merge branch 'hotfix/0.0.3.4'
mobile private post dont show error 404
fix missing indent for correct header container relative positions
Update Changelog.md
fix mentions at the end of a post
Merge pull request #4150 from svbergerem/3746-fix-mentions

fix mentions at the end of a post
Merge branch 'patch-2' of git://github.com/rivendale2010/diaspora into develop

Conflicts:
	Changelog.md
	app/views/layouts/_header.html.haml
Merge branch 'error_404_mobile' of git://github.com/movilla/diaspora into movilla-error_404_mobile

Conflicts:
	Changelog.md
404, not 500, if  signed out user wants to see a non public/existing post

Also add some specs for Post#find_by_guid_or_id_with_user
Add the gem updates section for the current release to the changelog
updated 186 locale files [ci skip]
change version to 0.1.0.0
Merge branch 'release/0.1.0.0'
Merge branch 'release/0.1.0.0' into develop
start new development cycle
Refactor config/ directory

* Get rid of early pathname requirement
* Use require_relative where approciate
* Drop unused files
* Imported new application.rb, environment.rb and environments/* from fresh Rails app
* Cleaned up boot.rb
* Load config in boot.rb
* Deduplicate environments/integration*.rb
* Move username blacklist into defaults.yml
* Ruby 1.9 Hash syntax everywhere
* Reorganize lib/diaspora/markdownify to match conventions
* Get rid of full path requires where possible
* Add dummy content to production section diaspora.yml.example to prevent warning
* Drop sqlite? method
* Move postgres? method into ConfigurationMethods
* Drop token authentication from User
Merge pull request #4145 from MrZYX/refactor_config_directory

Refactor config/ directory
Add tweet_id column to post
Twitter service removes status from twitter when post is revoked
Fix dispatcher_spec to depend on Tumblr which isn't retracting