Fixed issues with json parser not setting namescope on collections.  Fixed shape actual size computation.
Rebuilt Templates, ContentControl, and ContentPresenter and ApplyTemplate.