呵呵 冲突了
Merge branch 'master' of
https://github.com/157688302/virtual_targets.git

Conflicts:
	src/com/clw/signalenhancement/SwitchView.java