Merge branch 'hotfix/fix-multiple-redirection-bug'
Added content security headers
Merge branch 'develop'