passage à la branche maser sur le dev
commit de merge
testMerge branch 'master' of github.com:roulili/iteachyou

Conflicts:
	Modeles/ObjClient.php
	Modeles/config.php
	Modeles/creationClasse.php
	Modeles/flashWizard.php
	Modeles/webConfig.php
	Vues/Blocs/head.php
	Vues/Blocs/modalesNoCo.php
	Vues/css/font-awesome.min.css
	Vues/flashWizard.php
	Vues/js/ajax.js
	index.php
	photo/Adrien05_04_02_49_08.jpg
	photo/Armil11_03_09_07_38.jpg
	photo/Armil11_03_09_08_50.jpg
	photo/Armil11_03_09_17_15.jpg
	photo/Armil11_03_09_17_31.jpg
	photo/Dummies.jpg
	photo/Dweerts03_03_12_58_32.jpg
	photo/Eamonn Tobin25_04_12_32_44.jpg
	photo/Elodie10_07_07_10_42.jpg
	photo/Jerome Collignon26_03_09_29_39.jpg
	photo/Jessie15_03_06_53_00.jpg
	photo/Keviniad19_04_04_18_51.jpg
	photo/LalieRuisbroek01_04_12_03_34.jpg
	photo/Lezik16_03_01_47_00.png
	photo/Quentin16_03_06_46_04.jpg
	photo/Remix1323_03_08_55_58.jpg
	photo/Rouli03_02_01_07_35.jpg
	photo/Rouli03_02_01_08_12.jpg
	photo/Rouli04_02_03_18_51.jpg
	photo/Rouli06_02_05_27_48.jpg
	photo/Rouli06_02_05_29_29.jpg
	photo/Rouli07_02_08_56_08.jpg
	photo/Rouli11_02_12_18_29.jpg
	photo/Samcasier09_06_11_21_39.jpg
	photo/Vanecx03_03_02_06_21.jpg
	photo/Virginie18_02_04_56_29.png
	photo/Virginie22_03_02_21_31.jpg
	photo/Virginie22_03_02_22_39.jpg
	photo/Vivi.jpg
	photo/bestiole18_04_08_29_30.jpg
	photo/bulboide10_05_11_53_14.jpg
	photo/chose18_02_09_48_54.png
	photo/chose18_02_09_49_27.jpg
	photo/fvilers09_05_06_33_04.jpg
	photo/hiedel.gif
	photo/jessica21_05_04_44_08.jpg
	photo/lena.sobek18_05_08_07_35.png
	photo/lena.sobek18_05_08_10_17.png
	photo/lena.sobek18_05_08_11_47.png
	photo/noèmie25_04_01_52_00.jpg
	photo/noèmie25_04_01_54_42.jpg
	photo/noèmie25_04_02_03_05.jpg
	photo/phbosquet.jpg
	photo/romalops04_06_09_01_39.jpg
	photo/schrejo12_07_06_32_20.jpg
	photo/sebastien13_02_12_44_54.png
	photo/sebastien22_02_02_50_40.jpg
	photo/stephane03_03_02_21_38.jpg
	photo/stephane26_02_02_57_27.jpg
	photo/stéphane.jpg
	photo/temp/Adrien05_04_02_48_59.jpg
	photo/temp/Armil11_03_09_07_34.jpg
	photo/temp/Armil11_03_09_08_10.jpg
	photo/temp/Armil11_03_09_08_49.jpg
	photo/temp/Armil11_03_09_10_23.jpg
	photo/temp/Armil11_03_09_17_11.jpg
	photo/temp/Dweerts03_03_12_58_20.jpg
	photo/temp/Eamonn Tobin25_04_12_32_31.jpg
	photo/temp/Elodie10_07_07_10_02.jpg
	photo/temp/Jerome Collignon26_03_09_25_17.jpg
	photo/temp/Jerome Collignon26_03_09_29_20.jpg
	photo/temp/Jessie15_03_06_52_46.jpg
	photo/temp/Keviniad19_04_04_18_38.jpeg
	photo/temp/LalieRuisbroek01_04_12_03_21.jpg
	photo/temp/Lezik16_03_01_46_54.png
	photo/temp/Quentin16_03_06_44_14.jpg
	photo/temp/Quentin16_03_06_45_28.jpg
	photo/temp/Remix1323_03_08_54_09.jpg
	photo/temp/Rouli03_02_01_07_27.jpg
	photo/temp/Rouli03_02_01_08_04.jpg
	photo/temp/Rouli04_02_02_58_41.jpg
	photo/temp/Rouli06_02_05_27_41.jpg
	photo/temp/Rouli06_02_11_38_07.jpg
	photo/temp/Rouli07_02_08_55_37.jpg
	photo/temp/Rouli11_02_12_18_24.jpg
	photo/temp/Samcasier09_06_11_21_30.jpg
	photo/temp/Vanecx03_03_02_06_00.jpg
	photo/temp/Virginie18_02_04_54_06.png
	photo/temp/Virginie18_02_04_56_15.png
	photo/temp/Virginie22_03_02_21_01.jpg
	photo/temp/Virginie22_03_02_22_07.jpg
	photo/temp/bestiole18_04_08_27_02.jpg
	photo/temp/bestiole18_04_08_28_38.jpg
	photo/temp/bulboide10_05_11_52_55.jpg
	photo/temp/chose18_02_09_49_18.jpg
	photo/temp/fvilers09_05_06_32_51.jpg
	photo/temp/jessica21_05_04_43_28.jpg
	photo/temp/lena.sobek18_05_08_07_05.png
	photo/temp/lena.sobek18_05_08_09_44.png
	photo/temp/lena.sobek18_05_08_11_19.png
	photo/temp/noèmie25_04_01_51_36.jpeg
	photo/temp/noèmie25_04_01_54_22.jpeg
	photo/temp/noèmie25_04_02_02_24.jpeg
	photo/temp/romalops04_06_09_01_33.jpeg
	photo/temp/schrejo12_07_06_32_00.jpg
	photo/temp/sebastien13_02_12_43_45.png
	photo/temp/sebastien13_02_12_44_23.png
	photo/temp/sebastien13_02_12_44_50.png
	photo/temp/sebastien22_02_02_50_14.jpg
	photo/temp/stephane03_03_02_21_24.jpg
	photo/temp/stephane26_02_02_57_02.jpg
	photo/truc.jpg