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 - Akash - modifying seed data
1638 | Faris/Subhas | Don't run scheduler when deploying release1
Merge pull request #405 from rdsubhas/master

1638 | Subhas/Faris | Fix ubuntu installer
1580 | Subhas | Ability to specify couchdb username and password when creating couch admin
Revert "1639 | Subhas | Change report generation to Tuesday for checking cron"

This reverts commit c6c9148a731bffdc9f801b08177402aef814bdf2.
1644 - Akash - fixing issues with user history. making record creation an explicit entry in history
Merge pull request #407 from rdsubhas/master

Revert report generation back to Monday
1644 - Akash - removing history entries for other users when viewing user history log
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	db/seeds.rb
Merge pull request #410 from akash/master

#1644 - fixing user action histroy defects. #1600 - modified seed data
akash - adding rackbug temporarily to aid in performance monitoring in uat