[FIX] Faris : fixed functional test in basic_search.
[FIX] Faris : Added wait for page to load in basic_steps. Added one extra step to advanced_searcc and blacklist_device.
[FIX] Faris/Subhas : Modified I wait for the page to load.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#1543] Faris : Defect is fixed.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #350 from rdsubhas/master

Subhas/Faris - Fix more tests
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #349 from farismosman/master

[#1543] Fixing defect and browser tests.
1541 | Subhas/Faris | Fixed photo ordering after primary photo is changed