1
Merge branch 'master' of https://github.com/mcheung63/titan

Conflicts:
	src/main/java/com/titan/vm/VMLogDialog.java