IN PROGRESS
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	planning/urls.py
	planning/views.py