Integration of the app
Fixed conflict with the merge