Merge branch 'master' into 629_custom_sprint_tabs

Conflicts:
	CHANGES.md
	src/intranet3/templates/project/edit.html
	src/intranet3/templates/scrum/sprint/board.html
	src/intranet3/views/project/__init__.py
	src/intranet3/views/scrum/sprint.py