fix marketplace
increase marketplace launch timeout for all environmentts
Merge pull request #1127 from bebef1987/marketplace

fix marketplace
migrate TestDialerAddContact to app object
Bug 896541 - Device crashes into infinite loop when running Marketplace/ Persona
Merge pull request #1135 from bebef1987/disable_marketplace

Bug 896541 - Device crashes into infinite loop when running Marketplace/ Persona
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'