result register bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
result register bug fix
result register bug fix
result register bug fix