Renaming properties.
xcodeproje conflict
Merge branch 'develop'