add --ios-sdk flag to reset.sh to allow building with specific ios sdk ver
make it easy to switch test version for ios
change instruments timeout to something more reasonable
no need to wait 300s if instruments fails to launch
fix test for ios 7.0
Merge pull request #1120 from jlipps/master

more ios 7 compatibility updates