Moving static content to the right place
Merge branch 'develop'