Merge pull request #414 from rdsubhas/master

1600 | Subhas | Remove special characters from option strings
1635 - Suganthi/Kavitha - Modified search to fetch only child-id of all results during search

Conflicts:
	app/views/children/_search_results.html.erb
1634 - Suganthi - Merging histories while updating
Akash - added very basic jmeter script for loading of data to uat
Merge pull request #415 from akash/master

added basic jmeter script to load data into uat
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
1634 | Subhas | Fixing tests