Merge branch 'develop' into Antoine
Merge remote-tracking branch 'origin/Kevin' into Antoine
Merge branch 'Antoine' into develop
Modify Parser
modify parser 0.1
Merge remote-tracking branch 'origin/develop' into Kevin

Conflicts:
	ElyseLibrary/Parser.cs
update parser