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
update camera wait
Modified according to suggestion
update to capture_button_enabled
Fix for ftu tests
Merge pull request #558 from bebef1987/fix_camera

fix camera wait