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
1619 | Subhas | Change localhost to app URL
1219 | Subhas | Give generated IDs to roles and users
merged
Merge branch 'master' of github.com:rapidftr/RapidFTR
1580 | Subhas | Fix ubuntu installer

Conflicts:
	lib/tasks/scheduler.rake
Merge pull request #401 from paramadeep/master

1597
#1600 - Akash - modifying seed data
Merge pull request #398 from rdsubhas/replication_fix

1619 | Subhas | Change localhost to app URL
ci | Subhas | Do not run scheduler if on release1
Merge pull request #403 from rdsubhas/master

ci | Subhas | Capistrano | Do not start scheduler in release1 branch
Merge branch 'ubuntu_installer' of git://github.com/rdsubhas/RapidFTR
[#1638] Faris/Subhas : modified package.sh and postinstall.sh.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	config/recipes/app_tasks.rb