Merge branch 'hotfix/position'
added remove site feedback link
Merge branch 'hotfix/freedback_form' into develop