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

Conflicts:
	classes/WlsvLocalContentManager.php
	wordpress_convert.php
#
# It looks like you may be committing a MERGE.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.
#

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Committer: root <root@wordpressweb01.weblife.local>
#
# On branch server
# Your branch and 'origin/server' have diverged,
# and have 73 and 7 different commit(s) each, respectively.
#
# Changes to be committed:
#
#	modified:   classes/ContentConvertCartridge.php
#	modified:   classes/ContentConverter.php
#	modified:   classes/ContentManager.php
#	modified:   classes/LocalContentManager.php
#	modified:   classes/SecuredLocalContentManager.php
#	modified:   classes/WlsvLocalContentManager.php
#	modified:   classes/WordpressConvert.php
#	modified:   classes/WordpressConvertSetting.php
#	modified:   classes/WordpressConvertSettingConvert.php
#	modified:   classes/WordpressConvertSettingMenu.php
#	modified:   classes/cartridges/ConvertArticleCartridge.php
#	modified:   classes/cartridges/ConvertCommentCartridge.php
#	modified:   classes/cartridges/ConvertIgnoreCartridge.php
#	modified:   classes/cartridges/ConvertPathCartridge.php
#	modified:   classes/cartridges/ConvertWidgetCartridge.php
#	modified:   classes/cartridges/ConvertWidgetPartsCartridge.php
#	modified:   wordpress_convert.php
#