Merge branch 'develop'
Merge branch 'release-1.0'
Bumped version number to 1.2.1
Merge branch 'hotfix-1.2.1' into develop
pricing 1
Merge branch 'pricing' into develop