Team + Lieux
Merge branch 'master' of https://github.com/Gregory14/impala

Conflicts:
	impala-web/stylesheets/screen.css
	impala-web/user-profil.php
Merge branch 'master' of https://github.com/Gregory14/impala

Conflicts:
	impala-web/stylesheets/screen.css