add rb-fsevent to the Gemfile for our OS X devs
Really remove Devises timeoutable...
... and force it to really remember the session by a hidden field.
fix 3682, use correct image path for padlocks
update changelog
Merge pull request #3733 from marpo60/3682-fix-padlock-images

3682 fix padlock images
don't let the install script run as root user
add x-frame headers
get rid of string concat of translatable strings in getting started
Merge pull request #3727 from jaywink/feature/2321-fix-message-notifications

Fix notifications for private messages between local users, fixes #2321
updated 78 locale files [ci skip]
Merge pull request #3739 from davecocoa/feature/3534-add-x-frame-header

add x-frame headers
changelog update before release
Merge branch 'release/0.0.2.0'

Conflicts:
	Changelog.md
	config/defaults.yml
changelog update before release
post release version bump [ci skip]
force typhoeus (and thus curl) to use diaspora.yml's CA bundle
drop capistrano-ext, closes #3735
bump rails to 3.2.9
remove unused helpers
remove unused methods