Static Files not served correctly, hotfixed
Merge branch 'static_files_hotfix' into develop