Migrate settings app to use marionette By
migrate Cards view app to marionette By
migrate System app to marionette By
migrate LockScreen app to marionette By
migrate Phone app to marionette By
migrate Persona app to marionette By
migrate Unit tests app to marionette By
migrate FTU app to marionette By
migrate HomeScreen app to marionette By
Add a wait to bolster alarm tests

Conflicts:
	gaiatest/apps/clock/regions/alarm.py
fix tap on contact issue
remove delete_all_alarms from v1-train
Revert "Run stop b2g and start b2g with 'adb root' privs"

This reverts commit cedf51858c403f3b8c9db9ce76758a51617c8cd1.
Merge pull request #1205 from zacc/nit_align_v1_to_master

Nit align v1 to master
Wait for the call log upgrade progress bar to complete
Make the testvars argument optional
Bump version number to 0.13
Merge remote-tracking branch 'upstream/v1-train' into v1-train
migrate base.py to marionette.By
migrate gaia_test.py to marionette.By