updated and resolve git conflicts
add redirect in projects conroller to new rewards controller. add new rewards from as partial