options
Merge branch 'master' of https://github.com/Barbatos/BatailleSpatiale

Conflicts:
	src/client/vue/scenes/SceneOptionsMenu.hpp
fiiixxxx