android friendly
Merge branch 'master' of https://github.com/omg-insa/server into develop

Conflicts:
	api/views.py