TC
Merge branch 'master' of https://github.com/chcat/jtv

Conflicts:
	control/target/classes/ru/excelsior/jtv/control/Launcher.class