Merge branch 'develop'
fixed versionname
Merge branch 'master' into develop