Merge branch 'master' into local
Removed test code
Rename Renderable -> Drawable.
make Drawable concrete.
progress