Change objects
Merge github/master

Conflicts:
	assets/objects/example.json
	assets/objects/led.json
	assets/objects/objects-list.json