Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#1821] Akash/Faris : Added csv export feature test for a single record.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#1821] Akash/Faris : Added csv export feature test for multiple records.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
1790 | Subhas/Viky | Optimize migrations for all children
Remove SuggestedField from setup
[#1649] Faris : Advanced Search returns an error if query is empty or just white spaces.
Merge pull request #520 from akash/master

merging pull req 495
[#1649] Faris : Fixed names with special characters and spaces in the advanced search.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	capybara_features/csv_export.feature
	public/javascripts/translations.js
Merge pull request #521 from akash/master

merging pull req 502
Faris : Fixed failing test in child_spec.
Merge pull request #517 from farismosman/master

[#1821] Adding functional tests
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	capybara_features/step_definitions/login_steps.rb