Updated everything
Merge branch 'master' of https://github.com/sl/club-expo-signup

Conflicts:
	web interface/resources/site.coffee
	web interface/resources/site.js
	web interface/resources/site.js.map