Merge branch 'hotfix/dev-files'
Merge branch 'release/2.0.1'
Merge branch 'release/2.1'
change layout to move all links to external stuff to the end of the list
Merge branch 'hotfix/2.1.1' into develop