Merge branch 'hotfix/v0.1.0.1'
Merge branch 'release/0.1.1.0'
Disable invite button after sending invite
Create an InviteEmail worker.
Use InviteEmail worker in InvitationsController create action.
Merge pull request #4277 from davexunit/feature/4069

Background actual mailing when sending invitations
add changelog entry for #4277 [ci skip]
added strip_markdown to notification mails
bumped unicorn timeout to 90 seconds and made it configurable
private message sending changed to ajax

added specs for change in controller

one form of hash used in single line of code

rendering create response on sending message

redirect user to conversation page if message sent successfully

removed deprecated way of rendering file

conversations create for mobile fixed

minor code style change

updated changelog
Merge pull request #4226 from kevivmatrix/ajax_message

private message sending changed to ajax
Merge pull request #4251 from 0TWAIN0/feature/4182-render-markdown-in-mails

Feature/4182 render markdown in mails

Conflicts:
	Changelog.md
Merge pull request #4259 from netom/4173-disable-invite-button

Disable invite button after sending invite

Conflicts:
	Changelog.md
Put current user into gon

Fixed bug in app.js, removed unnecessray test
Put preloads into gon.preloads

Fixed tagFollowing not getting into preloads
Merge branch 'netom-4028-gon-current-user' into develop
Changed follow_diasporahq to be configurable to auto follow any user on join.

Fixing example config file

Updated changelog
Merge branch 'Ruxton-feature/autofollow_any_user' into develop
Fix pagination for people list on the tag stream page

Update _index.html.haml

This params broken the pagination of the followers list in tags page
To reproduce try to paginate in
https://joindiaspora.com/tags/diaspora

test for people pagination patch

reducing the per page limit

removing tabs
Merge branch 'fabianfiorotto-patch-1' into develop