fix fix
Merge branch 'master' of https://github.com/maellep/capoopa

Conflicts:
	api/capoopa/capoopa/settings.py