Store versioning information in an Xcode configuration file
Short version is marketing version
Do not take versioning information from project
Base configuration on ActiveResource.xcconfig
Merge branch 'feature/versioning' into develop
Marketing version 1.11.1
Merge branch 'release/1.11.1' into develop