ss
ss
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	Developpement/DreamPark/Controler/HomeControler.py
	UI/consumer_subscriver.ui
ss