PEP standards (indentation)
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	voyages/apps/voyage/models.py