Added cukes for functionality mentioned in #1220 in view_child_record_log.feature
Merge branch 'master' of https://github.com/rapidftr/RapidFTR
Merge branch 'master' of https://github.com/rapidftr/RapidFTR
Merge branch 'master' of https://github.com/san8888/RapidFTR into pull-req-450

Conflicts:
	capybara_features/step_definitions/web_steps.rb
Merge pull request #462 from akash/master

merging pull req 461
Merge branch 'pull-req-450'
Merge pull request #463 from akash/master

merging pull req 450
[#Fixing Tests] Faris : Removed all I wait for x seconds.