Merge branch 'master' into develop

# Conflicts:
#	assets/club/design-team.svg
#	assets/club/logistics-team.svg
#	assets/club/marketing-team.svg
#	assets/club/sponsorship-team.svg
#	sass/club.scss

Author: peterkos