Fixing current issues

Fixed template creation template-package shadowing. fixes #14.
Content type header set when serving resources. Common types added. fixes #15.