static folder, proper location fix
Merge branch 'develop' into staging