Load & merge anonymous order after loging in.
Fix test for moving anonymous donations to user.
Update order and payment after logging in.
Add some comments
New Bb version
simplify observer
Wait a bit longer after login
And simplify another observer too
[feature/CLUB-588] merge fix
[feature/CLUB-588] typo fix
[feature/CLUB-588] merge fix
[feature/CLUB-679] renabled flash toast for disabled account
Merge pull request #1408 from onepercentclub/feature/CLUB-588

Feature/club 588
Merge pull request #1409 from onepercentclub/feature/CLUB-679

[feature/CLUB-679] renabled flash toast for disabled account
Merge pull request #1401 from onepercentclub/feature/fix-merging-anonymous-order

Load & merge anonymous order after logging in.
Merge remote-tracking branch 'upstream/develop' into feature/remote-testing-with-saucelabs

Conflicts:
	apps/fund/static/js/bluebottle/orders/controllers.js