added but disabled a feature to allow for content type specific page tpls
added new node tpl stripped of chrome for a new content type designed for colorbox modal popups
merge conflict resolution