Update jp language.
3d studio support, bug fixes, language updates
Merge pull request #260 from KouOuchi/Update_jp_language_pullreq

Update jp language.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/RepetierHost/Main.Designer.cs
	src/RepetierHost/Main.cs
	src/RepetierHost/Main.resx
	src/RepetierHost/RepetierHost.csproj
	src/RepetierHost/connector/PrinterConnectorBase.cs
	src/RepetierHost/connector/SerialConnector.cs
	src/RepetierHost/model/GCodeGenerator.cs
	src/RepetierHost/model/PrintingStateSnapshot.cs
	src/RepetierHost/model/Printjob.cs
	src/RepetierHost/view/FormPrinterSettings.cs
	src/RepetierHost/view/JobStatus.cs
	src/RepetierHost/view/PrinterInfo.cs
	src/RepetierHost/view/SDCard.cs
	src/RepetierHost/view/ThreeDSettings.cs
	src/RepetierHost/view/utils/PauseInfo.cs
	src/data/translations/en.xml
	src/data/translations/es.xml
Added missing files
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/RepetierHost/Main.resx
	src/RepetierHost/RepetierHost.csproj
Remaining merge changes.
Merge branch 'master' into checkpoints

Conflicts:
	src/RepetierHost/Main.Designer.cs
	src/RepetierHost/Main.cs
	src/RepetierHost/Main.resx
	src/RepetierHost/RepetierHost.csproj
	src/RepetierHost/RepetierHost.suo
	src/RepetierHost/model/GCodeGenerator.cs
	src/RepetierHost/model/PrintingStateSnapshot.cs
	src/RepetierHost/view/utils/PauseInfo.cs
	src/data/translations/en.xml
	src/data/translations/es.xml
Missing file while commiting.
Set kikai printer default values.