Remove xfail email
Refactor both the everything.me search tests to check just the title and shortcusts listed
Merge pull request #1138 from teodosia/remove-xfail-branch

Remove xfail email
Merge pull request #1141 from zacc/refactor_eme_search_tests

Refactor eme search tests
Chnage the "is_wifi_enabled" property in GaiaData to inspect the mozWifiManager rather than the setting
Both FTU tests: Wait for WiFi to be enabled after loading FTU so that FTU Wifi panel will work first time
Xfailed test_cost_control_reset_wifi.py
Merge pull request #1144 from teodosia/xfail-cc-wifi-reset

Xfail test_cost_control_reset_wifi.py
verify the last page from the home screen
everything me app

Conflicts:

	gaiatest/tests/everythingme/test_everythingme_app_install.py
	gaiatest/tests/everythingme/test_everythingme_search.py
	gaiatest/tests/everythingme/test_everythingme_search_accented.py
Fix code review findings
wait for app to launch; use tap instead of click
pick up changes introduced by PR #1141
add wait for categories to be displayed
verify the last page from the home screen

Conflicts:

	gaiatest/tests/everythingme/test_everythingme_app_install.py
Updates to align e.me tests with master
Repair bad merge in test_everythingme_install_app.py
Removed unneccessary waits, sleeps, and element searches from keyboad app object
Checking if an element is currently present should not search for the element
Use input type to determine if we need to change to numeric layout
Update lockscreen tests - tap, geolocation, and wait