Add launch_timeout override to the GaiaApps launch method and upgrade Marketplace dev to use a 120second launch timeout
Merge pull request #1107 from vaidik/change_anon_user_region

add test to change anonymous user's region
Merge pull request #1129 from zacc/mk_extra_timeout

Marketplace Dev extra launch timeout
test receive email on active sync #91

Conflicts:
	gaiatest/tests/email/manifest.ini