setting version to 1.2.1-SNAPSHOT for master
Merge branch 'develop'
set version to 1.2.1
adjust MANIFEST files