trying something better for templates
small changes to db
changed template functionality and added custom error pages
fixed merge conflicts
fixing template option for page