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
Bug 846541 - [B2G][settings][keyboard]:Keyboard settings like "Word suggestion,"Auto Correction","Vibration" are disabled by default
use the html test result mixin
remove unnecessary imports
use b2g and endurance mixins
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
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
Bug 942140 - [Settings] when invoked as an activity, we should have a cross instead of a back button and pressing it should move back to the caller