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
Change login flow for Marketplace/Persona login test
Change format of marketplace creds in template
Merge remote-tracking branch 'upstream/master' into test-ftu

Conflicts:
	gaiatest/tests/manifest.ini
Merge remote-tracking branch 'upstream/master' into fix_mk_login_test

Conflicts:
	gaiatest/tests/marketplace/test_marketplace_login.py
Add lgoout steps into teardown of marketplace login test
Merge remote-tracking branch 'upstream/master' into fix_mk_login_test
Revert locator in test_ftu
wait for filmstrip in camera video test
Add note to readme about placing contact on SIM card
Use strict mode for all JavaScript
Merge remote-tracking branch 'upstream/master' into fix_mk_login_test
PR nits test_marketplace_login.py
Merge remote-tracking branch 'upstream/master' into test-ftu

PR nits
Merge pull request #186 from davehunt/strict-javascript

Use strict mode for all JavaScript
Enable a couple of contact tests no longer blocked.