ajout de Upload et orig
Merge branch 'gui'
merge