Merge branch 'gh-pages' into develop
Merge branch 'develop'
fixed versionname
Merge branch 'master' into develop
Merge branch 'develop' into gh-pages