use mixin pattern
use mixin pattern
move gaia mixins to gaia-ui-tests
Merge branch 'mixin' of https://github.com/malini/gaia into mixin

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/runtests.py
remove report directory. It has moved to marionette
use HTMLReportingTestResult
use the html test result mixin
remove unnecessary imports
use b2g and endurance mixins
Bug 938208 - Write test to enable Power Save mode
Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/gaia_test.py
	tests/python/gaia-ui-tests/gaiatest/runtests.py
Bug 943755 - Make some space for checkbox in Hotspot settings
Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/gaia_test.py
	tests/python/gaia-ui-tests/gaiatest/runtests.py
bad merge
accidentally removed close_app
Bug 943865 - Increase timeout in wait_for_filmstrip_not_visible
Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/runtests.py
remove extra whitespace
use specific imports for Bug 943313
Bug 941919 - [B2G][Video] Back button is difficult to see after selecting a video