fix marketplace
test receive email on active sync #91

Conflicts:
	gaiatest/tests/email/manifest.ini
Merge pull request #1024 from vaidik/master_receive_email_active_sync

test receive email on active sync #91
Merge pull request #1127 from bebef1987/marketplace

fix marketplace
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