Use device for emulators, not mobile, prepare for convention changes
Merge branch 'appium' into refactor_mobile_browser

Conflicts:
	src/behaving/mobile/steps.py
	src/behaving/web/steps/forms.py
Merge branch 'refactor_mobile_browser' into appium