Removed un needed locator in test_marketplace_login.py
fix active sync
Xfail Bug 915223 - crash in JSObject::putProperty(js::ExclusiveContext*,
Unxfail Bug 912147 - [B2G][Email]User is unable to log in to email account
Add an app region and test for Settings - Device Info

Conflicts:
	gaiatest/tests/settings/manifest.ini
Merge pull request #1357 from bobsilverberg/device_info

Add an app region and test for Settings - Device Info
Merge pull request #1358 from teodosia/issue-1336

Removed un needed locator in test_marketplace_login.py
fix test_setup_basic_gmail
Merge pull request #1354 from bebef1987/fix_activesync

fix active sync tests
Bug 912904 - [System][Dialogs][ActionMenu] Dialogs & Action menus (BB). Fixing UI-TEST about wallpaper & system.
Merge pull request #1362 from borjasalguero/fix_wallpaper_test

Bug 912904: Fix UI-TEST