[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
[FIX] Subhas/Faris : Fixed test in api_create_child.
Subhas/Faris | Fix more functional tests
1239
[#1239] Yekkanti|Kavitha Fixed the primary photo setting from mobile and the web
Merge branch '1239'
Kavitha|Yekkanti Fixed the regression defect around server to server sync not happening.
Yekkanti|Kavitha fixed a minor defect in url generartion
[#1543] Faris : Defect is fixed.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
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, enable GC when running in CI environment
Merge pull request #351 from rdsubhas/master

1541 | Fix photo ordering after changing primary photo
[#1552] Kavitha - Forms couldnt be created in language other than english