Merge 2.3m_WF8/master

Conflicts:
	launcher/src/main/java/org/masudanaika/launcher/Launcher.java