committing for backup
updated version to 2.1beta
Revert "updated version to 2.1beta"

This reverts commit 63d5937f721d5449667527e9f3a5682eaab3bb57.
Revert "committing for backup"

This reverts commit 027f921c2ca1a01541bfe1faa892c63ce07e9345.
Merge branch 'master' into dev