made the notification in reverse order.
Merge remote-tracking branch 'Jason/master'
merging with jason
Finished the project
Adding the replace controllers
Merge remote-tracking branch 'Jason/master'
Finished with the final version of our project.
Fixing some toasts