WIP test_everythingme (launch an application)
WIP test_everythingme (launch an application) (Update #1)
WIP test_everythingme (launch an application) (Update #1.1)
Merge branch 'master' of git://github.com/AaronMT/gaia-ui-tests-mozilla into test_everythingme
Merge branch 'master' of git://github.com/AaronMT/gaia-ui-tests-mozilla into test_everythingme
Create dialer object and use for test_dialer and test_call_log
Merge branch 'master' into call_log

Conflicts:
	gaiatest/tests/manifest.ini
	gaiatest/tests/test_dialer.py
Fix test_call_log_all_calls
Complete work on dialer and tests
xfail the tests
Merge branch 'master' into call_log

Conflicts:
	gaiatest/tests/manifest.ini
Remove stray print statement
Merge branch 'master' of github.com:mozilla/gaia-ui-tests into call_log
Update test_dialer and test_call_log to use Twilio
Updates from pull request review
Ensure locking/unlocking is in the system app context
Merge pull request #295 from davehunt/fix-lockscreen-context

Ensure locking/unlocking is in the system app context
test cards view with three apps
Merge branch 'master' into call_log

Conflicts:
	gaiatest/tests/manifest.ini
	gaiatest/tests/test_dialer.py
	setup.py
Fix merge conflicts
To make a clean branch of long_press_v2