Squashed commit of the following:

commit 3ec9b86e6541354d9a933c61462222f3b74ba07a
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Fri Jun 21 15:36:10 2013 +0300

    Update according reviews

commit b3d04e3a6c593ed887856b96158cce421597ee35
Merge: d04f8bb bdb9ca1
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Fri Jun 21 14:19:32 2013 +0300

    Merge remote-tracking branch 'origin/master' into mk_add_review

commit d04f8bbccec79a7a50bbb0c4a15144dc04b0f205
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Thu Jun 6 17:50:00 2013 +0300

    Updated according reviews

commit 5e88d27bc54530c10d7f7f879e281bed6c97eba8
Merge: 6069214 298d9ec
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Thu Jun 6 15:54:20 2013 +0300

    Merge remote-tracking branch 'origin/master' into mk_add_review

commit 6069214e6f70eec36726848e871bf13a7fcf288f
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Tue Jun 4 15:37:30 2013 +0300

    Updated according reviews

commit 3287dce5fd536de161fd98cba5b879976420e2cd
Merge: 3a3d188 88fb640
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Tue Jun 4 14:30:07 2013 +0300

    Merge remote-tracking branch 'origin/master' into mk_add_review

commit 3a3d18803ee1731e78244ccdbebb331b8ff59fb7
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Mon Jun 3 14:59:50 2013 +0300

    el.tap()

commit 0da7cf7a17de24207382853310a1ea5b92a38db4
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Mon Jun 3 14:49:28 2013 +0300

    Added mock and xfailed test

commit 9965e3c7d98173e29a2a28f0f5782d4426191f51
Merge: 8ff9f3f d05c62d
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Mon Jun 3 10:31:06 2013 +0300

    Merge remote-tracking branch 'origin/master' into mk_add_review

commit 8ff9f3f5a81b8db8d53c39add971d1ad2c953f01
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Fri May 24 13:17:26 2013 +0300

    Update according reviews

commit 06e20987872d98f2423a708e329d01e577fe58ec
Merge: 6886f98 f252c12
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Fri May 24 13:08:09 2013 +0300

    Merge remote-tracking branch 'origin/master' into mk_add_review

commit 6886f98300d50d564103dfe66bb772e15a0f2a46
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Wed May 22 18:38:30 2013 +0300

    update

commit b4e6ea3c0913e19a8981b4c7ec03cba3e9242751
Merge: 2c69aca 90606ac
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Wed May 22 14:44:12 2013 +0300

    Merge remote-tracking branch 'origin/master' into mk_add_review

commit 2c69acaf1a2a4c182b15b6f6d6033f933af4b851
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Fri May 17 11:37:54 2013 +0300

    Progress

commit d71f094c956b042df1adc9073b8f1f03a0fa502b
Merge: fd18fb9 383e665
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Mon May 13 17:06:28 2013 +0300

    Merge remote-tracking branch 'origin/master' into mk_add_review

    Conflicts:
    	gaiatest/apps/marketplace/app.py
    	gaiatest/apps/marketplace/regions/search_results.py
    	gaiatest/apps/marketplace/regions/settings.py

commit fd18fb95e1c236e0996601b348c42b0c8fbad7d7
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Mon May 13 17:02:41 2013 +0300

    init

commit 69527f221f3d17b588646e15eba30bcf664402fa
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Mon May 13 17:00:32 2013 +0300

    progress

commit 628cb2c8b59d4a7d66b9c61c93c4bbe008dc0103
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Date:   Fri May 3 13:58:46 2013 +0300

    Test add review
Create Settings app object
Migrate airplane mode, bluetooth and cell data settings tests to the app
Migrate language and keyboard language tests to the app
Migrate do not track, gps, and media storage
Migrate passcode, wallpaper and wifi

Use self.apps.displayed_app instead of passing app to panel

Update to address review comments:
- change Airplane mode switch locator
- remove unnecessary parentheses
Merge pull request #1033 from bobsilverberg/settings_app2

Create Settings app object
Add wait to bolster test_dialer_add_contact
Merge pull request #1050 from bobsilverberg/fix_add_contact

Add wait to bolster test_dialer_add_contact
Email tests unxfailed - Bug 888284 resolved
Merge pull request #1052 from zacc/unxfail_email_tests

Email tests unxfailed - Bug 888284 resolved
Added wait to fix test_sms.py

Added wait in init

Replaced wait
Wait for the comment field to be displayed before interacting with it
Dismiss the keyboard after sending keys to manual email setup fields
Wait for the homescreen page transition to end
Split launch unit tests
Remove desktop specific manifest and add skip logic to main manifest for appropriate desktop tests