added mapping point method.
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.js
	coreCalculator/Sensor.js