fix review controller
added date to review table
Fixed conflicts