fixed page designs conflict
Merge pull request #44 from tiger-swallowtails-2014/pages_templating_conflicts

fixed page designs conflict