Merge all the feature branches of the sprint into develop (xcode-project-file merging fun ๐Ÿ™ˆ)