merge ANSWER et PHOTO
merge
Merge branch 'master' of https://github.com/maellep/capoopa

Conflicts:
	api/capoopa/core/api.py
	app/capoopa/assets/www/js/main.js