Process Light Service
Process Light Service with updated coefficients
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.js
	app/index.html
	app/index/index.html