Change do not track tests and page object region to suit the new numeric preference and UX
xfail test_cc_data_alert_mobile.py with graphhics layer crash Bug 914809
Merge pull request #1353 from zacc/xfail_cc_reset_bug_914809

xfail test_cc_data_alert_mobile.py with graphhics layer crash Bug 914809
xfailed test_kill_app_from_cards_view due to
[Bug 915138 - Cards view can have a maximum of 3 cards](https://bugzilla.mozilla.org/show_bug.cgi?id=915138)
Merge pull request #1355 from AlinT/cards_view_fail

xfailed test_kill_app_from_cards_view due to
Merge pull request #1349 from zacc/change_do_not_track_prefs

Change do not track tests and page object region
Bug 886994 - Re-enable settings panel tests
Merge pull request #1339 from davehunt/bug886994

Bug 886994 - Re-enable settings panel tests
Merge remote-tracking branch 'upstream/master' into unxfail_tests

Conflicts:
	gaiatest/tests/settings/manifest.ini
	gaiatest/tests/tbpl-manifest.ini