Merge remote-tracking branch 'origin/unquiet-mail2' into unquiet-mail

Conflicts:
	src/ns.view.js
Merge remote-tracking branch 'origin/issue-441' into unquiet-mail
Merge remote-tracking branch 'origin/update-promise-chaining-optimize' into unquiet-mail

Conflicts:
	src/ns.update.js
fix tests