Merge branch 'hotfix-2.1.20'
Merge branch 'hotfix-2.1.19'
Merge branch 'hotfix-2.1.19'
Merge branch 'hotfix-2.1.19'
Change to the proposal list

- removed own proposals from the list
- allowing site admin to see all proposals of any org
Merge branch 'hotfix-2.1.21' into develop