Get Marketplace login working
Merge branch 'master' into marketplace_login
Remove errant comment and unnecessary tearDown
Enable sign out from Marketplace
Remove extraneous comment
Add an extra switch_to_frame() to improve reliability
Remove xfail from dialer mmi test
Merge pull request #660 from rwood-moz/removemmixfail

Remove xfail from dialer mmi test
Update test_settings_change_language locator
Merge pull request #661 from zacc/update_ch_lang_locator

Update test_settings_change_language locator
fix #652
Update test_cost_control_data_alert_mobile locator and tap
Xfail test_cards_view_with_three_apps.py Bug 846456
Merge pull request #663 from zacc/update_cc_locator

Update test_cost_control_data_alert_mobile locator and tap
Merge pull request #662 from bebef1987/fix_mk

Fix marketplace test
Merge pull request #665 from bebef1987/xfail_cards

Xfail test_cards_view_with_three_apps.py Bug 846456
Workaround for bug 861847 in test_sms.py
Workaround in test_notification for bug 861874
Merge pull request #666 from zacc/repair_test_notif_workaround

Workaround in test_notification for bug 861874
Merge pull request #667 from zacc/repair_sms_test

Workaround for bug 861847 in test_sms.py
XFail test_sms.py due to bug 862053