Minno: #1550 fixing scroll on too many form field on adding highlights field
merge master
Minno: updating gemfile.lock
Added cukes for functionality mentioned in #1220 in view_child_record_log.feature
New Scenario Added to pdf_export.feature & sleep removed from step files
Merge branch 'Story1550' of https://github.com/minhngocd/RapidFTR into pull-req-452
Merge pull request #464 from akash/master

merging pull req 452
Merge branch 'security_to_file_export' of https://github.com/san8888/RapidFTR into pull-req-458

Conflicts:
	capybara_features/step_definitions/web_steps.rb
Merge branch 'pull-req-458'
Merge pull request #465 from akash/master

merging pull req 458
[#Fixing Tests] Faris : Removed all I wait for x seconds.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of https://github.com/kjayamit/RapidFTR into pull-req-449

Conflicts:
	capybara_features/step_definitions/role_steps.rb
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
Merge pull request #468 from akash/master

reintroducing old json calls for backwards compatability
Faris/Akash/Subhas - updated deploy.rb to clean up old versions
Merge pull request #470 from akash/master

Faris/Akash/Subhas - updated deploy.rb to clean up old versions
Faris/Akash/Subhas - updated deploy.rb to clean up old versions