Fix conflicts
fixed changelog
fixed db config
fixed db config
fixed database password
fixed database password
removed database config
removed database config
removed db password
added safe database.yml
added database back in
Fix conflicts
Change destroy to delete in tribunals seed task
Fix conflicts
Fix rake data task