Fix up the entity namespace.
Update skeleton controller code.
Merge remote-tracking branch 'origin/master'