Added page.js and page template placeholders.
Merge remote-tracking branch 'origin/master'