Merge branch 'master' into develop
bump version 2.2.1

missed production configuration file in 2.2.0
Merge branch 'develop'