Several fixes for framework update

Added functionality that allows for display of custom templates.
Versioning Update