add new calculate method.
Merge remote-tracking branch 'origin/master'

Conflicts:
	SensorCalculator.js
add new calculate method.