1619 | Subhas | Change localhost to app URL
1219 | Subhas | Give generated IDs to roles and users
1580 | Subhas | Fix ubuntu installer

Conflicts:
	lib/tasks/scheduler.rake
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
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.
Merge pull request #407 from rdsubhas/master

Revert report generation back to Monday
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	db/seeds.rb