Still use page_display.tpl for pages.
Copy paste from one terminal to another changed tab to whitespace.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod/page.php
Merge remote-tracking branch 'upstream/master'
Some sys chan stuff
xref
Achievements
Ooops, also update the DB
Must have broken that in a merge - put it back
Style
Merge pull request #250 from beardy-unixer/master

Various bits