Merge pull request #4 from stephysim/deve

Deve
Merge pull request #1 from stephysim/master

test
Merge pull request #2 from stephysim/deve

Merge https://github.com/stephysim/LO21 into deve
zer
update

Signed-off-by: stephysim <stephanie.simeu@gmail.com>
update
Signed-off-by: stephysim <stephanie.simeu@gmail.com>
Merge branch 'master' into deve

Conflicts:
	CODE/TestUV/TestUV.pro.user
	CODE/build-projet-Desktop_Qt_5_3_0_MSVC2013_64bit-Debug/Makefile
	CODE/build-projet-Desktop_Qt_5_3_0_MSVC2013_64bit-Debug/Makefile.Debug
	CODE/build-projet-Desktop_Qt_5_3_0_MSVC2013_64bit-Debug/Makefile.Release
	CODE/build-projet-Desktop_Qt_5_3_0_MSVC2013_64bit-Debug/debug/UVEditeur.obj
	CODE/build-projet-Desktop_Qt_5_3_0_MSVC2013_64bit-Debug/debug/main.obj
	CODE/build-projet-Desktop_Qt_5_3_0_MSVC2013_64bit-Debug/debug/projet.pdb
	CODE/projet/main.cpp
	CODE/projet/projet.pro.user