Merge branch 'hotfix/0.0.1.1'
don't error out if the root of a reshare of a reshare got deleted, fixes #3546
Merge branch 'hotfix/3546-reshare'
bump version to 0.0.1.2
update and fix services
Add My Activity icon mobile
Add My Activity icon mobile
Fix overflow button in mobile reset password
Add Changelog
Merge pull request #3697 from movilla/overflow_input

Fix overflow button in mobile reset password
Fix empty page after callback from service by redirecting to origin. Also make settings/services page use the same window when authenticating with other services instead of launching a popup.
Merge pull request #3693 from jaywink/feature/3283-empty-page-after-service-callback

Fix empty page after callback from service by redirecting to origin
Always use basic Facebook Graph API to post messages, fixes public posts. Remove unnecessary Facebook opengraph config items
Merge branch 'feature/fix-facebook-public-posts' of git://github.com/jaywink/diaspora into feature/fix_services

Conflicts:
	Changelog.md
	app/models/services/facebook.rb
	spec/models/services/facebook_spec.rb
Merge pull request #3670 from MrZYX/feature/fix_services

update and fix services
Only include url to post for twitter when post exceeds maximum length or contains photos
Merge pull request #3702 from jaywink/feature/twitter-posting-fixes

Only include url to post for twitter when post exceeds maximum length or contains photos
use foremans formation option and not the alias concurrency, start unicorn_rails instead of unicorn
Remove non-portable bashisms from most of the scripts.
Only install.sh has any bashisms left. However, the bug
which prevented it from running on most systems (using
/bin/bash directly) has been fixed.
Fix buggy assumption that bash exists in /bin.
While here avoid bashisms in the first place.