User Rating completed and Notification of process
Notification Almost finished and Bug fixed
Conflicts fixed