Merge branch 'release/2.0' into develop
clean unused source files
update version text
Merge branch 'release/3'