Merge pull request #912 from zacc/browser_offset_taps

Offset the taps on the browser toolbar buttons
Conflicts:

	gaiatest/apps/browser/app.py
add wait for email method
Merge remote-tracking branch 'mozilla/v1.0.1' into v1.0.1
Merge pull request #909 from zacc/reenable_marketplace_tests

Re-enable the Marketplace tests after bugs 875261, 874337 resolved.
Merge pull request #910 from zacc/displayed

Add enhanced wait_for_element_displayed exception messages into base.py
Merge pull request #906 from bebef1987/v1.0.1

add wait for email method
SwitcH everythingme Facebook app with Twitter app
Facebook app is no longer in everything me!

Conflicts:
	gaiatest/tests/everythingme/test_everythingme.py
Remove all remaining mixin taps
Remove mixin reference from gaia_test.py

Conflicts:
	gaiatest/tests/dialer/test_dialer_add_contact.py
	gaiatest/tests/everythingme/test_everythingme.py
Merge branch 'v1.0.1' of github.com:mozilla/gaia-ui-tests into v1.0.1