Merge branch 'upstream/master'

Conflicts:
	pom.xml
	src/com/sb/elsinore/LaunchControl.java