Merge branch 'master' of github.com:swleipzig/schedule

Conflicts:
	public/config.json
	public/sass/_categorize.scss