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
Add FM Radio test suit
Merge branch 'test-ftu' of https://github.com/zacc/gaia-ui-tests-1 into ftu
Comment out SIM import
Update locators
Merge pull request #226 from bobsilverberg/ftu

Fixes to test_ftu
fix Nits
fix nits #2
fix Nits #3
Fit Nits #4
Disable test_calculator and remove references in test_cards_view
Removal of calculator in test_kill
Merge pull request #228 from AaronMT/test_remove_calc

Disable test_calculator and remove references in test_cards_view