added light bulb type pictures
Merge branch 'master' of https://github.com/tinazheng/teluxe
added light bulb type pictures
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/services/process_light_service.js