put version string diectly into setup.py
put correct version number also in version.txt
Merge branch 'release/2.0a1' into develop