Fixed project file issue related to merge error.
Merge branch 'master' of https://github.com/flomio/flomio_ios

This should resolve an Xcode project issue related to the last merge.