Fix pathes for web deploy
Merge branch 'develop'