Strip www
Merge branch 'develop'