confict ??
Merge branch 'master' of github.com:RDeville/ps4-perfo-cloud
Gestion conflit
Gestion de conflit
Romain : Gestion de conflit
Merge remote-tracking branch 'origin'

Conflicts:
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/js/bootstrap.min.js
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/js/gatling.js
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/js/highcharts-more.js
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/js/highstock.js
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/js/jquery.min.js
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/js/menu.js
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/js/theme.js
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/arrow_down.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/arrow_down_black.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/arrow_right.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/arrow_right_black.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/bootstrap.min.css
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/cible.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/favicon.ico
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/fond-degrade.gif
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/fond-lueur.gif
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/little_arrow_right.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/logo-gatling.jpg
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/logo.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/sortable.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/sorted-down.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/sorted-up.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/stat-fleche-bas.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/stat-fond.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/stat-l-roue.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/stat-l-temps.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/essaiSurVM-20140110123853/style/style.css
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/js/bootstrap.min.js
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/js/gatling.js
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/js/highcharts-more.js
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/js/highstock.js
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/js/jquery.min.js
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/js/menu.js
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/js/theme.js
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/arrow_down.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/arrow_down_black.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/arrow_right.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/arrow_right_black.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/bootstrap.min.css
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/cible.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/favicon.ico
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/fond-degrade.gif
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/fond-lueur.gif
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/little_arrow_right.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/logo-gatling.jpg
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/logo.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/sortable.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/sorted-down.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/sorted-up.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/stat-fleche-bas.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/stat-fond.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/stat-l-roue.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/stat-l-temps.png
	Gatling/gatling-charts-highcharts-2.0.0-M3a/results/testDimensionVM/scenario100and15-20140116194632/style/style.css
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/js/bootstrap.min.js
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/js/gatling.js
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/js/highcharts-more.js
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/js/highstock.js
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/js/jquery.min.js
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/js/menu.js
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/js/theme.js
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/arrow_down.png
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/arrow_down_black.png
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/arrow_right.png
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/arrow_right_black.png
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/bootstrap.min.css
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/cible.png
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/favicon.ico
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/fond-degrade.gif
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/fond-lueur.gif
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/little_arrow_right.png
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/logo-gatling.jpg
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/logo.png
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/sortable.png
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/sorted-down.png
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/sorted-up.png
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/stat-fleche-bas.png
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/stat-fond.png
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/stat-l-roue.png
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/stat-l-temps.png
	Gatling/gatling2.0/results/essaiSurVM-20140110123853/style/style.css
	Gatling/gatling2.0/target/zincCache
Romin : A priori le conflit devrait être terminé