add webserver and update motor service
Merge remote-tracking branch 'origin/master'

Conflicts:
	services/motor/motor.js
	services/motor/package.json