fix focus and power number

fix focus and power number
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/class/interface.js