Prepare for deploy
Merge branch 'develop'

Conflicts:
	_generated_media_names.py
Merge branch 'develop'
LILY-186 Add favicon
Merge branch 'develop' of github.com:HelloLily/hellolily into develop