increase marketplace launch timeout for all environmentts
migrate TestDialerAddContact to app object
Merge pull request #1120 from bebef1987/add_contact

migrate TestDialerAddContact to app object
Merge pull request #1134 from vaidik/fix_timeout_for_marketplace

increase marketplace launch timeout for all environmentts
Added carrier tag to default manifest file for cost control

Conflicts:

	gaiatest/tests/cost_control/manifest.ini
Merge remote-tracking branch 'upstream/master'
Revert "Bug 896541 - Device crashes into infinite loop when running Marketplace/ Persona"

This reverts commit 907697bbf4b836fa246233c04ea3a48baec9e6fb.
Remove xfail email
Merge pull request #1142 from bebef1987/revert

Revert "Bug 896541 - Device crashes into infinite loop when running Marketplace/ Persona"