next step in calendar frontend
Merge branch 'devel-backend' into devel-frontend

Conflicts:
	src/cal/views.py