[#Fixing Tests] Faris : Removed all I wait for x seconds.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #467 from akash/master

merging pull req 449
Merge pull request #466 from farismosman/master

[#Fixing Tests]
Faris/Akash - keeping old json calls in child controller to maintain backwards compatability