Merge branch 'hotfix/update_index'
add direct links if javascript is disabled
Merge branch 'hotfix/static_content_index' into develop