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
Merge pull request #417 from rdsubhas/master

1638 | Subhas | Fix Windows Installer
Merged conflicts
[Fixed Tests] Yekkanti - Fixed some failing tests
Yekkanti - Removed the db:migrate for cap deployments temporarily for performance testing. Should bring this back once the PT is done.
Merge branch 'master' of github.com:rapidftr/RapidFTR
[Performance Improvement] Suganthi|Yekkanti Changed the child_ids controller to fetch the ids and revs from a view instead of looping through all ids and revs in memory in the application
Merge branch 'master' of github.com:rapidftr/RapidFTR