Minno: #1550 fixing scroll on too many form field on adding highlights field
merge master
Minno: updating gemfile.lock
Merge branch 'master' of https://github.com/san8888/RapidFTR into pull-req-450

Conflicts:
	capybara_features/step_definitions/web_steps.rb
[#Refactoring] Faris: Moved api_edit_child and api_create_child features into one file.
Added cukes for functionality mentioned in #1220 in view_child_record_log.feature
[#Refactoring] Faris: Merged api_retrieve_child_record and api_retrieve_child_record_ids into one file api_retrieve_child_records.
New Scenario Added to pdf_export.feature & sleep removed from step files
[#Refactoring] Faris : Moved API tests into a separate folder.
[#Fixing Tests] Faris: Fixed translation test.
[#Fixing Tests] Faris : Fixed failing tests in add_custom_field_to_form_section. Removed all sleeping time in tests.
[#Fixing Tests] Faris : Removed I wait for x seconds.
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
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