Reset 2 commits before.
Merge branch 'master' of https://github.com/RDeluxe/blog.pierrickbignet

Conflicts:
	license.txt
	wp-content/plugins/advanced-code-editor/lang/advanced-code-editor-he_IL.po
	wp-content/plugins/advanced-code-editor/themes/default.css
	wp-content/plugins/advanced-code-editor/themes/raverStudio.css
	wp-content/plugins/advanced-code-editor/themes/solarizedDark.css
	wp-content/plugins/advanced-code-editor/themes/solarizedLight.css
	wp-content/plugins/duplicator/assets/css/jquery-ui.css
	wp-content/plugins/duplicator/assets/css/style.css
	wp-content/plugins/duplicator/assets/js/parsley-standalone.min.js
	wp-content/plugins/duplicator/classes/logging.php
	wp-content/plugins/duplicator/classes/package.archive.php
	wp-content/plugins/duplicator/classes/package.archive.zip.php
	wp-content/plugins/duplicator/classes/package.database.php
	wp-content/plugins/duplicator/classes/package.installer.php
	wp-content/plugins/duplicator/classes/package.php
	wp-content/plugins/duplicator/classes/server.php
	wp-content/plugins/duplicator/classes/settings.php
	wp-content/plugins/duplicator/classes/task.php
	wp-content/plugins/duplicator/classes/ui.php
	wp-content/plugins/duplicator/classes/utility.php
	wp-content/plugins/duplicator/define.php
	wp-content/plugins/duplicator/duplicator.php
	wp-content/plugins/duplicator/installer/build/ajax.step1.php
	wp-content/plugins/duplicator/installer/build/ajax.step2.php
	wp-content/plugins/duplicator/installer/build/assets/inc.css.php
	wp-content/plugins/duplicator/installer/build/assets/inc.js.php
	wp-content/plugins/duplicator/installer/build/assets/inc.libs.css.php
	wp-content/plugins/duplicator/installer/build/assets/inc.libs.js.php
	wp-content/plugins/duplicator/installer/build/classes/class.config.php
	wp-content/plugins/duplicator/installer/build/classes/class.logging.php
	wp-content/plugins/duplicator/installer/build/classes/class.serializer.php
	wp-content/plugins/duplicator/installer/build/classes/class.utils.php
	wp-content/plugins/duplicator/installer/build/main.installer.php
	wp-content/plugins/duplicator/installer/build/view.help.php
	wp-content/plugins/duplicator/installer/build/view.step0.php
	wp-content/plugins/duplicator/installer/build/view.step1.php
	wp-content/plugins/duplicator/installer/build/view.step2.php
	wp-content/plugins/duplicator/installer/build/view.step3.php
	wp-content/plugins/duplicator/lang/wpduplicator-de_DE.po
	wp-content/plugins/duplicator/lang/wpduplicator-es_ES.po
	wp-content/plugins/duplicator/lang/wpduplicator-pt_BR.po
	wp-content/plugins/duplicator/lang/wpduplicator.po
	wp-content/plugins/duplicator/lang/wpduplicator.pot
	wp-content/plugins/duplicator/readme.txt
	wp-content/plugins/duplicator/uninstall.php
	wp-content/plugins/duplicator/views/actions.php
	wp-content/plugins/duplicator/views/inc.header.php
	wp-content/plugins/duplicator/views/javascript.php
	wp-content/plugins/duplicator/views/packages/controller.php
	wp-content/plugins/duplicator/views/packages/list-nodata.php
	wp-content/plugins/duplicator/views/packages/list.base.php
	wp-content/plugins/duplicator/views/packages/new1.base.php
	wp-content/plugins/duplicator/views/packages/new1.inc.form.php
	wp-content/plugins/duplicator/views/packages/new2.base.php
	wp-content/plugins/duplicator/views/packages/new3.base.php
	wp-content/plugins/duplicator/views/settings/controller.php
	wp-content/plugins/duplicator/views/settings/diagnostics.php
	wp-content/plugins/duplicator/views/settings/general.php
	wp-content/plugins/duplicator/views/support.php
	wp-content/plugins/duplicator/views/tools/cleanup.php
	wp-content/plugins/duplicator/views/tools/controller.php
	wp-content/plugins/duplicator/views/tools/logging.php
	wp-content/plugins/enhanced-media-library/core/mime-types.php
	wp-content/plugins/enhanced-media-library/core/options-pages.php
	wp-content/plugins/enhanced-media-library/core/taxonomies.php
	wp-content/plugins/enhanced-media-library/css/eml-admin.css
	wp-content/plugins/enhanced-media-library/enhanced-media-library.php
	wp-content/plugins/enhanced-media-library/js/eml-custom-background.js
	wp-content/plugins/enhanced-media-library/js/eml-custom-header.js
	wp-content/plugins/enhanced-media-library/js/eml-customize-controls.js
	wp-content/plugins/enhanced-media-library/js/eml-media-models.js
	wp-content/plugins/enhanced-media-library/js/eml-media-views.js
	wp-content/plugins/enhanced-media-library/js/eml-options.js
	wp-content/plugins/enhanced-media-library/readme.txt
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/plugins/template/blank.htm
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/plugins/template/css/template.css
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/plugins/template/editor_plugin_src.js
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/plugins/template/js/template.js
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/plugins/template/langs/de_dlg.js
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/plugins/template/langs/es_dlg.js
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/plugins/template/langs/it_dlg.js
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/plugins/template/langs/ja_dlg.js
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/plugins/template/langs/nl_dlg.js
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/plugins/template/langs/pt_dlg.js
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/plugins/template/langs/sv_dlg.js
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/plugins/template/template.htm
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/utils/editable_selects.js
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/utils/form_utils.js
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/utils/mctabs.js
	wp-content/plugins/tinymce-templates/mce_plugins/3.5/utils/validate.js
	wp-content/plugins/wp-editor/extensions/fancybox/jquery.fancybox-1.3.4.css
	wp-content/themes/blog_theme/js/.svn/text-base/jquery.hoverdir.js.svn-base
	wp-content/themes/blog_theme/js/.svn/text-base/zoombox.js.svn-base
	wp-content/themes/blog_theme/js/jquery.hoverdir.js
	wp-content/themes/blog_theme/js/zoombox.js
	wp-content/themes/blog_theme/style.css
	wp-includes/images/crystal/license.txt
	wp-includes/js/jquery/jquery-migrate.js
	wp-includes/js/jquery/jquery-migrate.min.js