#1645 Added nil check to settings when adding flags to build files
Merge remote-tracking branch 'wordpress-mobile/pr/38' into develop
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-iOS into develop