Merge branch 'release/1.0' into develop
complete 1.0
added version
Merge branch 'release/1.1'