Merge branch 'feature/screens-fonts' into develop

Conflicts:
	django-verdant/requirements.txt