Merge old iOS branch into master

This will be my merging of my old iOS branch from the Attache repository into master of the Attache-iOS repository.