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
[#1613] Faris : translation.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
[#1613] Faris : translation.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	public/javascripts/translations.js
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.
Performance | Subhas | Remove sunspot reindex during deployment for UAT performance testing
Merge branch 'master' of github.com:rapidftr/RapidFTR
Merge branch 'master' of git://github.com/rapidftr/RapidFTR