This is for issue #481
Merge branch 'desktop' of https://github.com/mozilla/gaia-ui-tests into cost_control_reset
Modified according to zac's suggestion
modified according to suggestion
modified by pep8 standard
modified according to pep8
Cleaning up code
delete conflict file before merging
Merge https://github.com/mozilla/gaia-ui-tests into cost_control_reset
Merging with current head and adding items in manifest of cost control app
First Commit
#473 Gallery Edit Photo Effect

I stucked at verifying effect is applied and photo is changed. It seems
that this part is using canvas to chaging the effects.
Anyone got some idea about this? Attached is the code.
This is to test marketplace without connectivity
test marketplace without connectivity
Modified according to suggestion
Add wait and move assertions in test_ftu_skip_tour to give better failure results
Xfail test_keyboard - no engineering apps in eng build
Xfail test_dialer_add_contact - regression
Merge pull request #581 from zacc/xfail_two_ishoos

Xfail two tests - test_keyboard , test_dialer_add_contact
deleting all self.lockscreen.unlock() according to davehunt's suggestion
modified