Fix merge conflicts

###Config
`fix route to reflect problems#index as the root

###Test environment
`delete dlog

###Models
`add user association validation to problem model
`add has_secure_password to user model