Merge remote-tracking branch 'origin/Guillaume' into Kevin
process update
Merge remote-tracking branch 'origin/Guillaume' into Kevin
Merge remote-tracking branch 'origin/Antoine' into Kevin

Conflicts:
	GUI/MainWindow.cs
Add ComeFromAction & update parser ComeFrom
render
update parser
Merge remote-tracking branch 'origin/Kevin' into Antoine
render