Merge origin/master

Conflicts:
	public/resources/css/staffingtable.css
	public/sirstaffalot.html