Merge branch 'master' of https://github.com/mozilla/gaia-ui-tests into bluetoothdiscover
Final post-review changes
Merge remote-tracking branch 'remotes/rwood/bluetoothdiscover' into pr704

Conflicts:
	gaiatest/atoms/gaia_data_layer.js