Correct background.
Update TODO
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/jediterm/swing/SwingTerminalPanel.java