reverting disable photo wall functionality
reverted the functionality of disable photo wall
ignored translations.js file
reverted the translations.js git ignored stuff
merged
merged
merged conflicts
merged
Merge branch 'master' of github.com:rapidftr/RapidFTR
1600 | Subhas | Remove special characters from option_strings so that they don't interfere with search
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
Merge pull request #415 from akash/master

added basic jmeter script to load data into uat
1420 | Subhas | Fresh look at CSV and PDF encryption, sending encryped zip file instead
1420 | Subhas | Scheduled job to cleanup encrypted files
1420 | Subhas | Unit tests for Children page
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
1634 | Subhas | Fixing tests
Merge pull request #416 from rdsubhas/master

1420 | Subhas | CSV/PDF Security using encrypted zip files