Select Simulator Device & SDK

* use deviceName + version caps to launch a particular simulator device and SDK version (6.1, 7.0.3, 7.1)
* update appium-instruments submodule with corresponding change
* fail if the user tries to set preferences or language/locale and full-reset is requested since they don't work together

Fix #2032, #1642, #304
Merge pull request #2068 from jlipps/master

change safari webview xpath so it works on 7.1 ipad as well
Merge pull request #2060 from dandoveralba/51support

Select Simulator Device & SDK
Fix reset & setPreferences interop

*  restore reset to it's previous state for mobile/hybrid apps and preserve new approach for safari so it's app plist can be set
Merge pull request #2069 from dandoveralba/fix-locale

Update reset & setPreferences interop
Fix reset & setLocServicesPrefs interop

* same approach as with Safari prefs
Merge pull request #2070 from dandoveralba/fix-locale

Fix reset & setPreferences & setLocServicesPrefs interop
Add Location & Contacts Alerts

* reqest access to location and contacts in our sample app
Merge pull request #2072 from dandoveralba/alerts

Add Location & Contacts Alerts
Correct Reset

* sent an outdated pull last time
Merge pull request #2073 from dandoveralba/fix-reset

Correct Reset
npm packages track published branches
package update (regenerated using publish scripts)
Ensure apks are run through zipalign
Merge pull request #2074 from bootstraponline/zipalign

Ensure apks are run through zipalign
Fix for Instruments Before 7.1SDK

* don't pass the device string to instruments if we're less than 7.1 SDK
* clean up some logging
Parse Android package and launch activity from apk

Update logging

Add null guard

Prevent null waitPkg
Merge pull request #2076 from dandoveralba/fix703

Fix for Instruments Before 7.1SDK
Merge pull request #2075 from sebv/track-published

npm submodules track published branch + package update.
Merge pull request #2028 from bootstraponline/android_default

Parse Android package and launch activity from apk