Fixes #15: Page templates extend master
Merge pull request #17 from acleon/master

Fixes #15: Page templates extend master