Merge branch 'master' into 'beta'

Deploy changes to beta.sucs.org

These changes look good to me.

no bugs that I can find, deploy to beta and see if it still holds up.

See merge request !4