Updated locators for iOS7
Merge branch 'origin/master'