Merge the 'integrate' branch

To work efficiently on the app, we need to merge in the 'integration' branch.