Update locators for Marketplace-dev
Disable test_marketplace_search_for_paid_apps
Merge pull request #796 from zacc/update_marketplace_locators

Update locators for Marketplace-dev
update video name property
Fix for wifi test
Merge pull request #797 from bebef1987/fix_video

Fix video tests
Merge pull request #798 from AndreiH/fix_wifi_test

Fix for wifi test
fix media storage
update
Merge pull request #799 from AndreiH/fix_media_storage

fix media storage
Merge remote-tracking branch 'upstream/master' into buy_app

Conflicts:
	gaiatest/tests/marketplace/manifest.ini