Merge branch 'release-2.1.0'
Update change log, bump version num
Comment a new parameter
Merge branch 'release-2.1.1'
Update podspec
Merge branch 'master' into release-2.1.1
Merge branch 'release-2.1.1' into development
Merge branch 'development' into f/local-saves