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.
fix camera wait
This is to test marketplace without connectivity
test marketplace without connectivity
Only attempt to delete e.me installed app if it was actually installed
Gallery tests - wait for js to have loaded images rather than trust HTML
update camera wait
Xfail Bug 853829 - Gaia language/locale list changes after |make reset-gaia| on pvt build
Merge pull request #565 from bebef1987/xfail_language

Xfail Bug 853829 - Gaia language/locale list changes after |make reset-g...