TC
Merge branch 'master' of https://github.com/chcat/jtv
TC
TC
Merge branch 'master' into ivan2804-javafx-experiments

Conflicts:
	control/src/main/java/ru/excelsior/jtv/control/Launcher.java