Merge pull request #160 from bebef1987/fix_camera

Fix camera photo test
Merge pull request #161 from zacc/fix_mk_search_ins_test

Update marketplace search/install test
Merge remote-tracking branch 'upstream/master' into test-ftu

Conflicts:
	gaiatest/tests/manifest.ini
Kill is now asynchronous
Merge pull request #164 from davehunt/kill-async

Kill is now asynchronous
check for wifi manager fixes issue 152
Only interact with wifi if details are provided in testvars
Set a variable on the testcase class to indicate if wifi is available
Indicate tests that require a local area connection as separate to those requiring wifi, and only connect to wifi if it's available
Move settings unit tests around so we can mark them appropriately in the manifest files
Additional debug for killing apps
Use Clock instead of Contacts in test_launch_entrypoint.py
Merge pull request #158 from davehunt/wifi-lan

Indicate tests that require local area network and only use wifi if it's available and present in the test variables
Disable test_video_player due to issue #165
Merge pull request #166 from davehunt/disable-video-player

Disable test_video_player due to issue #165
Added the Clock test cases:
  launch,
  switch clock type,
  create new alarm,
  turn on and off alarm,
  delete alarm.
Merge branch 'test_radio'

Conflicts:
	gaiatest/tests/manifest.ini
Unlock and return to home screen before each test
Fail with an appropriate message if app launch fails
Merge remote-tracking branch 'mozilla/master' into test_clock