Android only :  Add a capability to bring up an Android app, without stopping the process,if it is already running
Added server capability stopAppOnReset
Added capability to selendroid
Added help for stopAppOnReset
do not use Configurator during class initialization
Add sendKeyStrategy to cap handler
Update caps.md
Merge pull request #4249 from imurchie/isaac-keyboard-caps

Add sendKeyStrategy to cap handler
Merge pull request #4224 from sangeethasriniv/master

Add new capability stopAppOnReset for android
use external simctl library
Merge pull request #4247 from testobject/fix_appium_for_api_level_below_18

do not use Configurator during class initialization
Merge pull request #4250 from jlipps/new-simctl

use external simctl library
Merge remote-tracking branch 'upstream/master' into retry_dump_ui_hierarchy

Conflicts:
	lib/devices/android/bootstrap/src/io/appium/android/bootstrap/AndroidElement.java