Merge branch 'master' of https://github.com/tinazheng/teluxe

Conflicts:
	app/Test/processLight.js
	app/index.html
	app/index/index.html
	app/services/process_light_service.js