save for working AJAX calls
Merge branch 'devel-backend' of github.com:tobias-engelmann/ProjectCM into devel-backend

Conflicts:
	src/cal/views.py