Merge branch 'master' into 'beta'

components/bananas.php

components/contents.php

components/debug.php

components/disk.graph.php

components/disk.php

components/election.php

components/electionreminder.php

components/email.php

components/events.php

components/events_ical.php

components/front.php

components/games.php

components/id.php

components/junk.php

components/library.php

components/libraryadmin.php

components/members.php

components/membershiprenew.php

components/menu.php

components/milliways.php