Merge remote-tracking branch 'origin/Thomas' into Rirols

Conflicts:
	Nebessa_Unity/ProjectSettings/Physics2DSettings.asset
Merge remote-tracking branch 'origin/Thomas' into Rirols

Conflicts:
	Nebessa_Unity/ProjectSettings/Physics2DSettings.asset
Merge remote-tracking branch 'origin/Rirols' into Thomas