Merge branch 'server' of https://github.com/NAONAOx1126/wordpress_convert into server Conflicts: wordpress_convert.php