Réindentation avec astyle
(cherry picked from commit a4ed1c7c6efe78c52e44281f5e708baf7c44a7e6)
Merge branch 'master' into config_gros_robot_princess

Conflicts:
	asserv/config/config.cpp