Conflicts:
	VERSIONS
	cosmogramme/php/classes/classe_log.php
	cosmogramme/php/integre_log.php
	cosmogramme/php/integre_log_sql.php
	cosmogramme/php/integre_traite_main.php
	library/Class/Admin/Skin.php
	library/Class/Cosmogramme/Integration/PhasePrepareIntegrations.php
	library/startup.php
	public/admin/css/global.css
	public/admin/skins/bokeh74/global.css
	tests/library/Class/MoteurRechercheTest.php