Merge branch 'master' into develop
correct path to web dir
update version
Merge branch 'release_0.1.17'