Etiquettes
Merge remote-tracking branch 'origin/master'

Conflicts:
	duck_inscription/models/apogee_models.py