..
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/dethnull/joscontrol/gui/newgui/components/console/Console.java
Yes