Add ios7 option in FindBy annotation
Merge branch 'origin/master'
Fix HistoryPageAndroid