- fix merge conflicts in the page template
Merge branch 'newdcamp' of https://github.com/johncionci/drupal-basetheme into newdcamp