#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.
Add wait and move assertions in test_ftu_skip_tour to give better failure results
deleting all self.lockscreen.unlock() according to davehunt's suggestion
Merge pull request #582 from ypwalter/clean_lockscreen_unlock

cleaning up all files by removing self.lockscreen.unlock()
#473 change sleep to wait for condition

Change time.sleep to wait_for_condition
Merge branch 'issue_473'

Conflicts:
	gaiatest/tests/gallery/manifest.ini
Merge remote-tracking branch 'upstream/master'
Added the bug comments before the xfails
@zacc discovered that if we do xfail = true  #  bug comment
then the test is ignored and not commented
Removed fmradio xfails
Bug 829566 Marionette/Double mouse events for tap has been fixed
added blank line
Merge pull request #585 from AlinT/proper_xfails

Added the bug comments before the xfails
Merge remote-tracking branch 'mozilla/master' into fmradion_xpasses
updated according to comments
Merge pull request #586 from AlinT/fmradion_xpasses

Remove fmradio xfails
Unxfail airplane mode test that is now passing
Merge pull request #580 from zacc/issue_577

Add wait and move assertions in test_ftu_skip_tour
Merge pull request #590 from bobsilverberg/unxfail

Unxfail airplane mode test that is now passing