style stuff
Merge branch 'master' of github.com:swleipzig/schedule
style stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/Schedule.xml