Initial test_ftu.py commit
Merge remote-tracking branch 'davehunt/wifi-forget' into test-ftu
FTU revisions due to changed HTML
Merge remote-tracking branch 'upstream/master' into test-ftu
Add test for FTU app
Merge remote-tracking branch 'upstream/master' into test-ftu

Conflicts:
	gaiatest/tests/manifest.ini
Revert locator in test_ftu
Add note to readme about placing contact on SIM card
Merge remote-tracking branch 'upstream/master' into test-ftu

PR nits
fix #188 Update to use the phone date
enable test_search_marketplace_and_install_app.py for debug
Enable test_marketplace_login
Remove potentially leaking ondatachange event listener
Add wallpaper test to manifest file
Merge pull request #214 from davehunt/add-wallpaper-to-manifest

Add wallpaper test to manifest file
Merge pull request #211 from zacc/enable_mk_login

Enable test_marketplace_login
Merge pull request #210 from bebef1987/enable_mk_install

enable test_search_marketplace_and_install_app.py for debug
Update based on changes to lock screen
Merge branch 'fix_lockscreen'
Music test is now passing after removing rogue audio from sdcard