Merge branch 'master' into 'beta'

new join.sucs.org page

See merge request !114
3 jobs for beta in 6 minutes and 47 seconds (queued for 3 seconds)