Bug 935636 - Avoid duplicating data on contact merge
Bug 1020961 - [Collection app] Loading progress indicator and Connectivity message [r=amirn, kgrandon]
Bug 1015837 - [System] Sound toast visual refresh
Merge pull request #20288 from dominickuo/bug-1015837

Bug 1015837 - [System] Sound toast visual refresh, r= alivedise
Merge pull request #19343 from michalbe/Bug935636

Bug 935636 - Avoid duplicating data on contact merge
Update README.md of settings app
Bug 1024295 - [bb][header] Missing images
Merge pull request #20412 from pivanov/bug-1024295

Bug 1024295 - [bb][header] Missing images
Merge pull request #20290 from EverythingMe/1020961-indications

Bug 1020961 - [Collection app] Loading progress indicator and Connectivity message
Bug 874510 - upgrade Mocha to a more recent version r=yurenju

This uses the same Mocha that is specified in package.json
update travis jobs