commit to merge code
Merge branch 'master' of github.com:cwyark/CasparCG-Scheduler

Conflicts:
	models.py
	scheduler.py
	web.py