Update cache policy logic from compiler error
Update for analyzer warning
Update change log, remove unnecessary build settings
Merge branch 'ios7' into release-2.1.0