Merge branch 'master'

Conflicts:
	frontend/nbproject/project.properties
	frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java

diff --cc frontend/nbproject/project.properties
Simple merge

diff --cc frontend/src/saccubus/MainFrame.java
Simple merge

diff --cc frontend/src/saccubus/SavePanel.java
Simple merge

diff --cc frontend/src/saccubus/converter/FfmpegCommand.java
Simple merge

diff --cc frontend/src/saccubus/converter/filegetter/CommentFileWebGetter.java
Simple merge

diff --cc frontend/src/saccubus/converter/filegetter/FileInstanciator.java
Simple merge

diff --cc frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
index ec0eb0b,19c4343..b1e8e6c
--- 1/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
--- 2/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
+++ b/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
@@@ -3,11 -3,14 +3,15 @@@ package saccubus.converter.filegetter
  
  import java.io.IOException;
  import java.text.Normalizer;
+ import org.apache.commons.lang.StringUtils;
  import saccubus.ConvertStopFlag;
 -import saccubus.converter.profile.Proxy;
+ import saccubus.net.CommentInfo;
  import saccubus.net.NicoClient;
  import saccubus.net.VideoInfo;
+ import saccubus.util.WayBackTimeParser;
+ import yukihane.inqubus.saccubus_adapter.NicoBrowserAdapter;
 +import yukihane.saccubus.converter.profile.Proxy;
 +import yukihane.saccubus.converter.profile.LoginInfo;
  
  /**
   * 動画ファイル, コメントファイルなど必要なファイルのうち, 1つでもダウンロード処理を必要とする場合のインスタンス化クラス.

diff --cc frontend/src/saccubus/net/VideoInfo.java
Simple merge

diff --cc frontend/src/yukihane/nicovideo/NicoDBFinder.java
Simple merge