Fix issue #48
Merge branch 'master' of https://github.com/llazzaro/django-scheduler
Merge branch 'master' into timely

Conflicts:
	schedule/views.py